Nautilus: no longer customizing menubars

helpers/make-nautilus

 #!/bin/sh
 #
-#    Copyright (C) 2013  Rubén Rodríguez <ruben@trisquel.info>
+#    Copyright (C) 2013-2016  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=13
-QUILT=skip
-COMPONENT=main
+VERSION=1
 . ./config
 
 for patch in 15_use-ubuntu-help.patch 16_unity_new_documents.patch; do
@@ -27,56 +25,6 @@ for patch in 15_use-ubuntu-help.patch 16_unity_new_documents.patch; do
   sed "/$patch/d" -i debian/patches/series
 done
 
-sed 's/show_app_menu && !show_menubar/1 == 0/' debian/patches/restore-traditional-menu-bar.patch -i
-
-export QUILT_PATCHES=debian/patches
-quilt push -a
-
-cat << EOF | patch -p1
-diff -ru nautilus-3.10.1/src/nautilus-toolbar.c nautilus-3.10.1.mod/src/nautilus-toolbar.c
---- nautilus-3.10.1/src/nautilus-toolbar.c	2014-04-26 21:59:56.000000000 +0000
-+++ nautilus-3.10.1.mod/src/nautilus-toolbar.c	2014-04-26 22:49:46.000000000 +0000
-@@ -571,7 +571,7 @@
- 		}
- 	}
- 
--	/* Separator and Close */
-+	/* Separator and Close
-         if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME")) {
- 		separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
- 		gtk_container_add (GTK_CONTAINER (toolbar), separator);
-@@ -596,7 +596,7 @@
- 		} else {
- 			gtk_widget_set_margin_left (button, 6);
- 		}
--	}
-+	}*/
- 	g_signal_connect_swapped (nautilus_preferences,
- 				  "changed::" NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY,
- 				  G_CALLBACK (toolbar_update_appearance), self);
-diff -ru nautilus-3.10.1/src/nautilus-window.c nautilus-3.10.1.mod/src/nautilus-window.c
---- nautilus-3.10.1/src/nautilus-window.c	2014-04-26 21:59:56.000000000 +0000
-+++ nautilus-3.10.1.mod/src/nautilus-window.c	2014-04-27 00:42:05.000000000 +0000
-@@ -1500,7 +1500,7 @@
- 	/* disable automatic menubar handling, since we show our regular
- 	 * menubar together with the app menu.
- 	 */
--	gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (self), FALSE);
-+	gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (self), TRUE);
- 
- 	grid = gtk_grid_new ();
- 	gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
-@@ -1520,7 +1520,7 @@
- 			 G_CALLBACK (nautilus_window_load_extension_menus), window, G_CONNECT_SWAPPED);
- 
- 	window->details->toolbar = create_toolbar (window);
--	if (g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME")) {
-+	if (g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME-shell")) {
- 		gtk_container_add (GTK_CONTAINER (grid), window->details->toolbar);
- 		gtk_widget_set_hexpand (window->details->toolbar, TRUE);
- 		gtk_widget_set_vexpand (window->details->toolbar, FALSE);
-EOF
-
 changelog "Revert from using ubuntu-help to default gnome-help"
 compile