Merge lp:~3v1n0/nautilus/menubar-visibility-signals into lp:~ubuntu-desktop/nautilus/ubuntu

[Marco Trevisan (Treviño)]

debian/patches/restore-traditional-menu-bar.patch: update menubar visibility on GktSettings changes

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-18 19:50:21 +0000
+++ debian/changelog	2016-04-26 12:20:49 +0000
@@ -1,3 +1,10 @@
+nautilus (1:3.18.4.is.3.14.3-0ubuntu5) UNRELEASED; urgency=medium
+
+  * debian/patches/restore-traditional-menu-bar.patch:
+    - update menubar visibility on GktSettings changes
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 26 Apr 2016 14:08:09 +0200
+
 nautilus (1:3.18.4.is.3.14.3-0ubuntu4) xenial; urgency=medium
 
   * debian/nautilus.migrations, 

=== modified file 'debian/patches/restore-traditional-menu-bar.patch'
--- debian/patches/restore-traditional-menu-bar.patch	2016-02-03 11:49:50 +0000
+++ debian/patches/restore-traditional-menu-bar.patch	2016-04-26 12:20:49 +0000
@@ -17,13 +17,18 @@
  src/nautilus-window.c              | 10 +++--
  9 files changed, 299 insertions(+), 69 deletions(-)
 
-Index: b/src/nautilus-application-actions.c
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-application-actions.c
 ===================================================================
---- a/src/nautilus-application-actions.c
-+++ b/src/nautilus-application-actions.c
-@@ -258,8 +258,8 @@
- void
- nautilus_init_application_actions (NautilusApplication *app)
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-application-actions.c
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-application-actions.c
+@@ -255,36 +255,64 @@ static GActionEntry app_entries[] = {
+ 	{ "close-desktop", action_close_desktop, NULL, NULL, NULL },
+ };
+ 
+-void
+-nautilus_init_application_actions (NautilusApplication *app)
++static void
++update_menubar_visibility (NautilusApplication *app)
  {
 -	GtkBuilder *builder;
 -	GError *error = NULL;
@@ -31,18 +36,14 @@
 +	gboolean show_menubar;
  	const gchar *debug_no_app_menu;
  
- 	g_action_map_add_action_entries (G_ACTION_MAP (app),
-@@ -267,18 +267,31 @@
- 					 app);
- 	gtk_application_add_accelerator (GTK_APPLICATION (app), "F10", "win.gear-menu", NULL);
- 
+-	g_action_map_add_action_entries (G_ACTION_MAP (app),
+-					 app_entries, G_N_ELEMENTS (app_entries),
+-					 app);
+-	gtk_application_add_accelerator (GTK_APPLICATION (app), "F10", "win.gear-menu", NULL);
+-
 -	builder = gtk_builder_new ();
 -	gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/nautilus-app-menu.ui", &error);
-+	g_object_get (gtk_settings_get_default (),
-+		      "gtk-shell-shows-app-menu", &show_app_menu,
-+		      "gtk-shell-shows-menubar", &show_menubar,
-+		      NULL);
- 
+-
 -	if (error == NULL) {
 -		gtk_application_set_app_menu (GTK_APPLICATION (app),
 -					      G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
@@ -50,6 +51,24 @@
 -		g_critical ("Unable to add the application menu: %s\n", error->message);
 -		g_error_free (error);
 -	}
+-
+-	g_object_unref (builder);
+-
+ 	debug_no_app_menu = g_getenv ("NAUTILUS_DEBUG_NO_APP_MENU");
+ 	if (debug_no_app_menu) {
+ 		DEBUG ("Disabling app menu GtkSetting as requested...");
+ 		g_object_set (gtk_settings_get_default (),
+ 			      "gtk-shell-shows-app-menu", FALSE,
+ 			      NULL);
++
++		return;
++	}
++
++	g_object_get (gtk_settings_get_default (),
++		      "gtk-shell-shows-app-menu", &show_app_menu,
++		      "gtk-shell-shows-menubar", &show_menubar,
++		      NULL);
++
 +	/* Only add the app menu when the shell doesn't show the menu
 +	 * bar, because we merge the app menu into the menu bar.
 +	 */
@@ -59,8 +78,7 @@
 +
 +		builder = gtk_builder_new ();
 +		gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/nautilus-app-menu.ui", &error);
- 
--	g_object_unref (builder);
++
 +		if (error == NULL) {
 +			gtk_application_set_app_menu (GTK_APPLICATION (app),
 +						      G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
@@ -70,14 +88,30 @@
 +		}
 +
 +		g_object_unref (builder);
-+	}
- 
- 	debug_no_app_menu = g_getenv ("NAUTILUS_DEBUG_NO_APP_MENU");
- 	if (debug_no_app_menu) {
-Index: b/src/nautilus-canvas-view-ui.xml
+ 	}
+ }
++
++void
++nautilus_init_application_actions (NautilusApplication *app)
++{
++	g_action_map_add_action_entries (G_ACTION_MAP (app),
++					 app_entries, G_N_ELEMENTS (app_entries),
++					 app);
++	gtk_application_add_accelerator (GTK_APPLICATION (app), "F10", "win.gear-menu", NULL);
++
++	update_menubar_visibility (app);
++
++	g_signal_connect_swapped (gtk_settings_get_default (),
++				  "notify::gtk-shell-shows-app-menu",
++				  G_CALLBACK (update_menubar_visibility), app);
++	g_signal_connect_swapped (gtk_settings_get_default (),
++				  "notify::gtk-shell-shows-menubar",
++				  G_CALLBACK (update_menubar_visibility), app);
++}
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-canvas-view-ui.xml
 ===================================================================
---- a/src/nautilus-canvas-view-ui.xml
-+++ b/src/nautilus-canvas-view-ui.xml
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-canvas-view-ui.xml
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-canvas-view-ui.xml
 @@ -1,4 +1,23 @@
  <ui>
 +  <menubar name="menubar">
@@ -102,10 +136,10 @@
    <popup name="ViewMenu" accelerators="true">
      <placeholder name="Layout Options">
        <menuitem name="Manual Layout" action="Manual Layout"/>
-Index: b/src/nautilus-directory-view-ui.xml
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-directory-view-ui.xml
 ===================================================================
---- a/src/nautilus-directory-view-ui.xml
-+++ b/src/nautilus-directory-view-ui.xml
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-directory-view-ui.xml
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-directory-view-ui.xml
 @@ -4,6 +4,85 @@
  <accelerator action="OpenCloseParent"/>
  <accelerator action="PropertiesAccel"/>
@@ -192,10 +226,10 @@
  <popup name="ViewMenu" accelerators="true">
    <placeholder name="View Details">
      <menuitem name="Reset to Defaults" action="Reset to Defaults"/>
-Index: b/src/nautilus-list-view-ui.xml
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-list-view-ui.xml
 ===================================================================
---- a/src/nautilus-list-view-ui.xml
-+++ b/src/nautilus-list-view-ui.xml
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-list-view-ui.xml
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-list-view-ui.xml
 @@ -1,4 +1,11 @@
  <ui>
 +  <menubar name="menubar">
@@ -208,10 +242,10 @@
    <popup name="ViewMenu" accelerators="true">
      <placeholder name="View Details">
        <menuitem name="Visible Columns" action="Visible Columns"/>
-Index: b/src/nautilus-shell-ui.xml
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-shell-ui.xml
 ===================================================================
---- a/src/nautilus-shell-ui.xml
-+++ b/src/nautilus-shell-ui.xml
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-shell-ui.xml
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-shell-ui.xml
 @@ -74,4 +74,96 @@
          <separator/>
  	<placeholder name="After Zoom Items"/>
@@ -309,11 +343,11 @@
 +  </menu>
 +</menubar>
  </ui>
-Index: b/src/nautilus-toolbar.c
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-toolbar.c
 ===================================================================
---- a/src/nautilus-toolbar.c
-+++ b/src/nautilus-toolbar.c
-@@ -377,6 +377,18 @@
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-toolbar.c
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-toolbar.c
+@@ -377,6 +377,18 @@ gear_menu_key_press (GtkWidget *widget,
          return FALSE;
  }
  
@@ -332,7 +366,7 @@
  static void
  nautilus_toolbar_constructed (GObject *obj)
  {
-@@ -426,16 +438,18 @@
+@@ -426,16 +438,18 @@ nautilus_toolbar_constructed (GObject *o
  	self->priv->location_entry = nautilus_location_entry_new ();
  	gtk_header_bar_pack_start (GTK_HEADER_BAR (toolbar), self->priv->location_entry);
  
@@ -360,7 +394,7 @@
  
  	/* View buttons */
  	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-@@ -446,11 +460,14 @@
+@@ -446,11 +460,14 @@ nautilus_toolbar_constructed (GObject *o
  	button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_GRID, NULL);
  	gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
  	gtk_container_add (GTK_CONTAINER (box), button);
@@ -380,11 +414,11 @@
  
  	gtk_style_context_add_class (gtk_widget_get_style_context (box),
  				     GTK_STYLE_CLASS_RAISED);
-Index: b/src/nautilus-window-menus.c
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-window-menus.c
 ===================================================================
---- a/src/nautilus-window-menus.c
-+++ b/src/nautilus-window-menus.c
-@@ -473,6 +473,11 @@
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-window-menus.c
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-window-menus.c
+@@ -473,6 +473,11 @@ action_view_radio_changed (GtkRadioActio
  }
  
  static const GtkActionEntry main_entries[] = {
@@ -396,7 +430,7 @@
    /* name, stock id, label */  { "Help", NULL, N_("_Help") },
    /* name, stock id */         { NAUTILUS_ACTION_CLOSE, NULL,
    /* label, accelerator */       N_("_Close"), "<control>W",
-@@ -628,7 +633,7 @@
+@@ -628,7 +633,7 @@ static const GtkToggleActionEntry main_t
  static const GtkRadioActionEntry view_radio_entries[] = {
  	{ NAUTILUS_ACTION_VIEW_LIST, "view-list-symbolic", N_("List"),
  	  "<control>1", N_("View items as a list"), 0 },
@@ -405,7 +439,7 @@
  	  "<control>2", N_("View items as a grid of icons"), 1 }
  };
  
-@@ -662,14 +667,19 @@
+@@ -662,14 +667,19 @@ nautilus_window_initialize_actions (Naut
   * 
   * Create and install the set of menus for this window.
   * @window: A recently-created NautilusWindow.
@@ -426,7 +460,7 @@
  
  	window->details->ui_manager = gtk_ui_manager_new ();
  	ui_manager = window->details->ui_manager;
-@@ -728,7 +738,17 @@
+@@ -728,7 +738,17 @@ nautilus_window_initialize_menus (Nautil
  			  G_CALLBACK (connect_proxy_cb), window);
  
  	/* add the UI */
@@ -444,11 +478,11 @@
  }
  
  static GList *
-Index: b/src/nautilus-window-private.h
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-window-private.h
 ===================================================================
---- a/src/nautilus-window-private.h
-+++ b/src/nautilus-window-private.h
-@@ -108,7 +108,7 @@
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-window-private.h
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-window-private.h
+@@ -108,7 +108,7 @@ void nautilus_window_sync_up_button
  
  /* window menus */
  void               nautilus_window_initialize_actions                    (NautilusWindow    *window);
@@ -457,11 +491,11 @@
  
  void               nautilus_window_update_show_hide_menu_items           (NautilusWindow     *window);
  
-Index: b/src/nautilus-window.c
+Index: nautilus-3.18.4.is.3.14.3/src/nautilus-window.c
 ===================================================================
---- a/src/nautilus-window.c
-+++ b/src/nautilus-window.c
-@@ -1439,6 +1439,7 @@
+--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-window.c
++++ nautilus-3.18.4.is.3.14.3/src/nautilus-window.c
+@@ -1439,6 +1439,7 @@ nautilus_window_constructed (GObject *se
  	GtkWidget *grid;
  	NautilusWindowSlot *slot;
  	NautilusApplication *application;
@@ -469,7 +503,7 @@
  	const gchar * desktop;
  
  	window = NAUTILUS_WINDOW (self);
-@@ -1460,9 +1461,14 @@
+@@ -1460,9 +1461,14 @@ nautilus_window_constructed (GObject *se
  	gtk_widget_show (grid);
  	gtk_container_add (GTK_CONTAINER (window), grid);