[nautilus/path-bar-templates-and-extensions] f
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/path-bar-templates-and-extensions] f
- Date: Wed, 18 Jul 2018 16:06:39 +0000 (UTC)
commit 7b21f8dd0763a39421ae52317eade84f00e08b6a
Author: Carlos Soriano <csoriano gnome org>
Date: Wed Jul 18 18:04:52 2018 +0200
f
build-aux/flatpak/org.gnome.Nautilus.json | 2 +-
src/nautilus-files-view.c | 10 +++++-----
src/nautilus-pathbar.c | 5 ++++-
src/nautilus-toolbar.c | 1 +
src/nautilus-ui-utilities.c | 1 -
5 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 02cd6b07e..fb3dcffb8 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -128,7 +128,7 @@
],
"build-options" : {
"env" : {
- "G_DEBUG" : "fatal-criticals"
+ "G_DEBUG" : "fatal-critic"
}
}
}
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 93e48d4e0..24b89f96d 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -3535,7 +3535,7 @@ nautilus_files_view_send_selection_change (NautilusFilesView *view)
}
static void
-nautilus_files_view_set_location (NautilusView *view,
+real_view_set_location (NautilusView *view,
GFile *location)
{
NautilusDirectory *directory;
@@ -5090,7 +5090,7 @@ update_extensions_menus (NautilusFilesView *view)
}
else
{
- g_print ("extensions background items empty \n");
+ //g_print ("FILES VIEW: extensions background items empty \n");
}
if (background_menu != NULL)
@@ -5860,11 +5860,11 @@ update_templates_menu (NautilusFilesView *view)
}
if (submenu != NULL)
{
- g_print ("items before!!! %d\n", g_menu_model_get_n_items (G_MENU_MODEL (submenu)));
+ g_print ("FILES_VIEW: update templates menu %d\n", g_menu_model_get_n_items (G_MENU_MODEL
(submenu)));
}
else
{
- g_print ("background items empty \n");
+ g_print ("FILES VIEW: update templates menu NULL \n");
}
if (submenu != NULL)
{
@@ -9495,7 +9495,7 @@ static void
nautilus_files_view_iface_init (NautilusViewInterface *iface)
{
iface->get_location = nautilus_files_view_get_location;
- iface->set_location = nautilus_files_view_set_location;
+ iface->set_location = real_set_location;
iface->get_selection = nautilus_files_view_get_selection;
iface->set_selection = nautilus_files_view_set_selection;
iface->get_search_query = nautilus_files_view_get_search_query;
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index ed3c81376..bd05fcb01 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -1241,12 +1241,15 @@ nautilus_path_bar_set_menu_sections (NautilusPathBar *self,
if (menu_sections->templates_menu != NULL)
{
- g_print ("in path bar nitems before!!! %d\n", g_menu_model_get_n_items (G_MENU_MODEL
(menu_sections->templates_menu)));
+ g_print ("templates in path bar nitems before!!! %d\n", g_menu_model_get_n_items (G_MENU_MODEL
(menu_sections->templates_menu)));
nautilus_gmenu_merge (priv->current_view_menu,
menu_sections->templates_menu,
"templates-submenu",
TRUE);
}
+ else {
+ g_print ("path bar templates item NULL\n");
+ }
if (menu_sections->extensions_background_menu != NULL)
{
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 84d12e5e8..e5a6d832e 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -1236,6 +1236,7 @@ on_slot_path_bar_menu_sections_changed (NautilusToolbar *self,
GParamSpec *param,
NautilusWindowSlot *slot)
{
+ g_print ("TOOLBAR: on slot path bar menu sections changed\n");
nautilus_path_bar_set_menu_sections (NAUTILUS_PATH_BAR (self->path_bar),
nautilus_window_slot_get_path_bar_menu_sections (slot));
}
diff --git a/src/nautilus-ui-utilities.c b/src/nautilus-ui-utilities.c
index d09bd423c..cc8d71ed3 100644
--- a/src/nautilus-ui-utilities.c
+++ b/src/nautilus-ui-utilities.c
@@ -120,7 +120,6 @@ nautilus_gmenu_merge (GMenu *original,
n_items = g_menu_model_get_n_items (G_MENU_MODEL (gmenu_to_merge));
- g_print ("n_items %d\n", n_items);
for (i = 0; i < n_items; i++)
{
if (prepend)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]