Merge lp:~larsu/eog/menubar into lp:~ubuntu-desktop/eog/ubuntu

[Lars Karlitski]

* Add debian/patches/0001-Add-a-traditional-menu-bar.patch
* Update debian/patches/0002-Show-traditional-title-bar-in-unity.patch:
  update to make work with menubar patch and use GActionGroup's signals

* Add debian/patches/0001-Add-a-traditional-menu-bar.patch
* Update debian/patches/0002-Show-traditional-title-bar-in-unity.patch:
  update to make work with menubar patch and use GActionGroup's signals

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-21 10:57:41 +0000
+++ debian/changelog	2015-09-29 10:38:28 +0000
@@ -1,8 +1,14 @@
-eog (3.16.3-1ubuntu2) UNRELEASED; urgency=medium
+eog (3.16.3-1ubuntu4) UNRELEASED; urgency=medium
 
+  [ Iain Lane ]
   * Make the toolbar hide in fullscreen.
 
- -- Iain Lane <[e-mail]>  Mon, 21 Sep 2015 11:53:13 +0100
+  [ Lars Uebernickel ]
+  * Add debian/patches/0001-Add-a-traditional-menu-bar.patch
+  * Update debian/patches/0002-Show-traditional-title-bar-in-unity.patch:
+    update to make work with menubar patch and use GActionGroup's signals
+
+ -- Lars Uebernickel <[e-mail]>  Tue, 29 Sep 2015 12:30:46 +0200
 
 eog (3.16.3-1ubuntu1) wily; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2015-09-21 10:53:08 +0000
+++ debian/control	2015-09-29 10:38:28 +0000
@@ -5,7 +5,8 @@
 Source: eog
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Andreas Henriksson <[e-mail]>, Iain Lane <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
 Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Apps/EyeOfGnome
 
=== modified file 'debian/control.in'
--- debian/control.in	2015-05-27 16:03:38 +0000
+++ debian/control.in	2015-09-29 10:38:28 +0000
@@ -1,7 +1,8 @@
 Source: eog
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Apps/EyeOfGnome
 
=== added file 'debian/patches/0001-Add-a-traditional-menu-bar.patch'
--- debian/patches/0001-Add-a-traditional-menu-bar.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Add-a-traditional-menu-bar.patch	2015-09-29 10:38:28 +0000
@@ -0,0 +1,360 @@
+From b7cf1b9c79f6c547ac8daec82d3fa851ceec839d Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <[e-mail]>
+Date: Fri, 25 Sep 2015 10:27:24 +0200
+Subject: [PATCH 1/2] Add a traditional menu bar
+
+---
+ data/eog-menubar.xml  | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/eog-application.c |  39 +++++++---
+ src/eog-window.c      |  44 ++++++-----
+ src/eog.gresource.xml |   1 +
+ 4 files changed, 259 insertions(+), 30 deletions(-)
+ create mode 100644 data/eog-menubar.xml
+
+diff --git a/data/eog-menubar.xml b/data/eog-menubar.xml
+new file mode 100644
+index 0000000..cc99604
+--- /dev/null
++++ b/data/eog-menubar.xml
+@@ -0,0 +1,205 @@
++<?xml version="1.0" encoding="utf-8"?>
++<interface>
++  <menu id="menubar">
++    <submenu>
++      <attribute name="label" translatable="yes">_Image</attribute>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Open…</attribute>
++          <attribute name="action">win.open</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;o</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Save</attribute>
++          <attribute name="action">win.save</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;s</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">_Save As…</attribute>
++          <attribute name="action">win.save-as</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;&lt;Shift&gt;s</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">Print…</attribute>
++          <attribute name="action">win.print</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;p</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">Set as _Wallpaper</attribute>
++          <attribute name="action">win.set-wallpaper</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;F8</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">Show Containing _Folder</attribute>
++          <attribute name="action">win.open-folder</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">Image Properties</attribute>
++          <attribute name="action">win.properties</attribute>
++          <attribute name="accel">&lt;Alt&gt;Return</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Close</attribute>
++          <attribute name="action">win.close</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;w</attribute>
++        </item>
++      </section>
++    </submenu>
++    <submenu>
++      <attribute name="label" translatable="yes">_Edit</attribute>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Undo</attribute>
++          <attribute name="action">win.undo</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;z</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Copy Image</attribute>
++          <attribute name="action">win.copy</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;c</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">Flip _Horizontal</attribute>
++          <attribute name="action">win.flip-horizontal</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">Flip _Vertical</attribute>
++          <attribute name="action">win.flip-vertical</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Rotate Clockwise</attribute>
++          <attribute name="action">win.rotate-90</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;r</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">Rotate Counter_clockwise</attribute>
++          <attribute name="action">win.rotate-270</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;&lt;Shift&gt;r</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">Move to _Trash</attribute>
++          <attribute name="action">win.move-trash</attribute>
++          <attribute name="accel">Delete</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">_Delete</attribute>
++          <attribute name="action">win.delete</attribute>
++          <attribute name="accel">&lt;Shift&gt;Delete</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Preferences</attribute>
++          <attribute name="action">app.preferences</attribute>
++        </item>
++      </section>
++    </submenu>
++    <submenu>
++      <attribute name="label" translatable="yes">_View</attribute>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Statusbar</attribute>
++          <attribute name="action">win.view-statusbar</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">_Image Gallery</attribute>
++          <attribute name="action">win.view-gallery</attribute>
++          <attribute name="accel">F9</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">Side _Pane</attribute>
++          <attribute name="action">win.view-sidebar</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;F9</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">Zoom _In</attribute>
++          <attribute name="action">win.zoom-in</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;plus</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">Zoom _Out</attribute>
++          <attribute name="action">win.zoom-out</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;minus</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">_Best Fit</attribute>
++          <attribute name="action">win.toggle-zoom-fit</attribute>
++          <attribute name="accel">F</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Fullscreen</attribute>
++          <attribute name="action">win.view-fullscreen</attribute>
++          <attribute name="accel">F11</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">Slide Show</attribute>
++          <attribute name="action">win.view-slideshow</attribute>
++          <attribute name="accel">F5</attribute>
++        </item>
++      </section>
++    </submenu>
++    <submenu>
++      <attribute name="label" translatable="yes">_Go</attribute>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Previous Image</attribute>
++          <attribute name="action">win.go-previous</attribute>
++          <attribute name="accel">Left</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">_Next Image</attribute>
++          <attribute name="action">win.go-next</attribute>
++          <attribute name="accel">Right</attribute>
++        </item>
++      </section>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_First Image</attribute>
++          <attribute name="action">win.go-first</attribute>
++          <attribute name="accel">&lt;Alt&gt;Home</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">_Last Image</attribute>
++          <attribute name="action">win.go-last</attribute>
++          <attribute name="accel">&lt;Alt&gt;End</attribute>
++        </item>
++      </section>
++    </submenu>
++    <submenu>
++      <attribute name="label" translatable="yes">_Help</attribute>
++      <section>
++        <item>
++          <attribute name="label" translatable="yes">_Manual</attribute>
++          <attribute name="action">win.manual</attribute>
++          <attribute name="accel">&lt;Ctrl&gt;F1</attribute>
++        </item>
++        <item>
++          <attribute name="label" translatable="yes">_About</attribute>
++          <attribute name="action">app.about</attribute>
++        </item>
++      </section>
++    </submenu>
++  </menu>
++</interface>
+diff --git a/src/eog-application.c b/src/eog-application.c
+index 785ae49..3de5265 100644
+--- a/src/eog-application.c
++++ b/src/eog-application.c
+@@ -169,17 +169,34 @@ eog_application_init_app_menu (EogApplication *application)
+ 					 application);
+ 
+ 	builder = gtk_builder_new ();
+-	gtk_builder_add_from_resource (builder,
+-				       "/org/gnome/eog/ui/eog-app-menu.xml",
+-				       &error);
+-
+-	if (error == NULL) {
+-		gtk_application_set_app_menu (GTK_APPLICATION (application),
+-					      G_MENU_MODEL (gtk_builder_get_object (builder,
+-		                                                                    "app-menu")));
+-	} else {
+-		g_critical ("Unable to add the application menu: %s\n", error->message);
+-		g_error_free (error);
++
++	if (gtk_application_prefers_app_menu (GTK_APPLICATION (application))) {
++		gtk_builder_add_from_resource (builder,
++					       "/org/gnome/eog/ui/eog-app-menu.xml",
++					       &error);
++
++		if (error == NULL) {
++			gtk_application_set_app_menu (GTK_APPLICATION (application),
++						      G_MENU_MODEL (gtk_builder_get_object (builder,
++											    "app-menu")));
++		} else {
++			g_critical ("Unable to add the application menu: %s\n", error->message);
++			g_error_free (error);
++		}
++	}
++	else {
++		gtk_builder_add_from_resource (builder,
++					       "/org/gnome/eog/ui/eog-menubar.xml",
++					       &error);
++
++		if (error == NULL) {
++			gtk_application_set_menubar (GTK_APPLICATION (application),
++						     G_MENU_MODEL (gtk_builder_get_object (builder,
++											   "menubar")));
++		} else {
++			g_critical ("Unable to add the application menu: %s\n", error->message);
++			g_error_free (error);
++		}
+ 	}
+ 
+ 	action = g_action_map_lookup_action (G_ACTION_MAP (application),
+diff --git a/src/eog-window.c b/src/eog-window.c
+index 738213f..ff5762c 100644
+--- a/src/eog-window.c
++++ b/src/eog-window.c
+@@ -4266,18 +4266,30 @@ eog_window_construct_ui (EogWindow *window)
+ 			   priv->zoom_scale);
+ 	gtk_widget_show (priv->zoom_scale);
+ 
+-	menu_button = gtk_menu_button_new ();
+-	menu_image = gtk_image_new_from_icon_name ("open-menu-symbolic",
+-						   GTK_ICON_SIZE_BUTTON);
+-	gtk_button_set_image (GTK_BUTTON (menu_button), menu_image);
++	priv->open_with_menu = g_menu_new ();
++	priv->appinfo = g_ptr_array_new_with_free_func (g_object_unref);
++
++	if (gtk_application_prefers_app_menu (GTK_APPLICATION (EOG_APP))) {
++		menu_button = gtk_menu_button_new ();
++		menu_image = gtk_image_new_from_icon_name ("open-menu-symbolic",
++							   GTK_ICON_SIZE_BUTTON);
++		gtk_button_set_image (GTK_BUTTON (menu_button), menu_image);
++
++		builder = gtk_builder_new_from_resource ("/org/gnome/eog/ui/eog-gear-menu.ui");
++		builder_object = gtk_builder_get_object (builder, "gear-menu");
++		gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
++						G_MENU_MODEL (builder_object));
+ 
+-	builder = gtk_builder_new_from_resource ("/org/gnome/eog/ui/eog-gear-menu.ui");
+-	builder_object = gtk_builder_get_object (builder, "gear-menu");
+-	gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
+-					G_MENU_MODEL (builder_object));
++		gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
++		gtk_widget_show (menu_button);
+ 
+-	gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
+-	gtk_widget_show (menu_button);
++		builder_object = gtk_builder_get_object (builder, "open-with-menu");
++		g_menu_append_section (G_MENU (builder_object),
++				       NULL,
++				       G_MENU_MODEL (priv->open_with_menu));
++		priv->gear_menu_builder = builder;
++		builder = NULL;
++	}
+ 
+ 	fullscreen_button = gtk_button_new_from_icon_name ("view-fullscreen-symbolic",
+ 							   GTK_ICON_SIZE_BUTTON);
+@@ -4288,15 +4300,6 @@ eog_window_construct_ui (EogWindow *window)
+ 	gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), fullscreen_button);
+ 	gtk_widget_show (fullscreen_button);
+ 
+-	priv->open_with_menu = g_menu_new ();
+-	priv->appinfo = g_ptr_array_new_with_free_func (g_object_unref);
+-	builder_object = gtk_builder_get_object (builder, "open-with-menu");
+-	g_menu_append_section (G_MENU (builder_object),
+-			       NULL,
+-			       G_MENU_MODEL (priv->open_with_menu));
+-	priv->gear_menu_builder = builder;
+-	builder = NULL;
+-
+ 	priv->cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ 	gtk_box_pack_start (GTK_BOX (priv->box), priv->cbox, TRUE, TRUE, 0);
+ 	gtk_widget_show (priv->cbox);
+@@ -5241,6 +5244,9 @@ eog_window_get_gear_menu_section (EogWindow *window, const gchar *id)
+ 	GObject *object;
+ 	g_return_val_if_fail (EOG_IS_WINDOW (window), NULL);
+ 
++	if (window->priv->gear_menu_builder == NULL)
++		return NULL;
++
+ 	object = gtk_builder_get_object (window->priv->gear_menu_builder, id);
+ 	if (object == NULL || !G_IS_MENU (object))
+ 		return NULL;
+diff --git a/src/eog.gresource.xml b/src/eog.gresource.xml
+index 0f69c90..9f6bc43 100644
+--- a/src/eog.gresource.xml
++++ b/src/eog.gresource.xml
+@@ -3,6 +3,7 @@
+   <gresource prefix="/org/gnome/eog/ui">
+     <file>eog.css</file>
+     <file compressed="true" preprocess="xml-stripblanks">eog-app-menu.xml</file>
++    <file compressed="true" preprocess="xml-stripblanks">eog-menubar.xml</file>
+     <file compressed="true" preprocess="xml-stripblanks">eog-gear-menu.ui</file>
+     <file compressed="true" preprocess="xml-stripblanks">eog-image-properties-dialog.ui</file>
+     <file compressed="true" preprocess="xml-stripblanks">eog-multiple-save-as-dialog.ui</file>
+-- 
+2.5.0
+
 
=== added file 'debian/patches/0002-Show-traditional-title-bar-in-unity.patch'
--- debian/patches/0002-Show-traditional-title-bar-in-unity.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0002-Show-traditional-title-bar-in-unity.patch	2015-09-29 10:38:28 +0000
@@ -0,0 +1,139 @@
+From fd12d0136bfd9abc8a121f47775c2200237e535f Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <[e-mail]>
+Date: Tue, 29 Sep 2015 12:25:29 +0200
+Subject: [PATCH 2/2] Show traditional title bar in unity
+
+Based on a patch by Sebastien Bacher <[e-mail]>
+---
+ src/eog-window.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 55 insertions(+), 11 deletions(-)
+
+diff --git a/src/eog-window.c b/src/eog-window.c
+index ff5762c..4e3c716 100644
+--- a/src/eog-window.c
++++ b/src/eog-window.c
+@@ -134,6 +134,7 @@ struct _EogWindowPrivate {
+ 	GtkWidget           *zoom_revealer;
+ 	GtkWidget           *zoom_scale;
+ 	GtkWidget           *properties_dlg;
++	GtkWidget           *headerbar;
+ 
+ 	GMenu               *open_with_menu;
+ 	GPtrArray           *appinfo;
+@@ -4196,6 +4197,43 @@ eog_window_zoom_button_toggled_cb (GtkToggleButton *button, gpointer user_data)
+ 	gtk_button_set_image (GTK_BUTTON (button), zoom_image);
+ }
+ 
++static gboolean
++in_desktop (const gchar *name)
++{
++	const gchar *desktop_name_list;
++	gchar **names;
++	gboolean in_list = FALSE;
++	gint i;
++
++	desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP");
++	if (!desktop_name_list)
++		return FALSE;
++
++	names = g_strsplit (desktop_name_list, ":", -1);
++	for (i = 0; names[i] && !in_list; i++)
++		if (strcmp (names[i], name) == 0) {
++			in_list = TRUE;
++			break;
++		}
++	g_strfreev (names);
++
++	return in_list;
++}
++
++static void
++on_action_state_changed (GActionGroup *action_group,
++			 gchar        *name,
++			 GVariant     *value,
++			 gpointer      user_data)
++{
++	EogWindow *window = user_data;
++	EogWindowPrivate *priv = window->priv;
++
++	gtk_widget_set_visible (GTK_WIDGET (priv->headerbar),
++				priv->mode != EOG_WINDOW_MODE_FULLSCREEN &&
++				priv->mode != EOG_WINDOW_MODE_SLIDESHOW);
++}
++
+ static void
+ eog_window_construct_ui (EogWindow *window)
+ {
+@@ -4207,7 +4245,6 @@ eog_window_construct_ui (EogWindow *window)
+ 
+ 	GtkWidget *popup_menu;
+ 	GtkWidget *hpaned;
+-	GtkWidget *headerbar;
+ 	GtkWidget *zoom_button;
+ 	GtkWidget *zoom_image;
+ 	GtkWidget *menu_button;
+@@ -4222,12 +4259,19 @@ eog_window_construct_ui (EogWindow *window)
+ 	gtk_container_add (GTK_CONTAINER (window), priv->box);
+ 	gtk_widget_show (priv->box);
+ 
+-	headerbar = gtk_header_bar_new ();
+-	gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE);
+-	gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
+-				  g_get_application_name ());
+-	gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
+-	gtk_widget_show (headerbar);
++	priv->headerbar = gtk_header_bar_new ();
++	if (!in_desktop ("Unity")) {
++		gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (priv->headerbar), TRUE);
++		gtk_header_bar_set_title (GTK_HEADER_BAR (priv->headerbar), g_get_application_name ());
++		gtk_window_set_titlebar (GTK_WINDOW (window), priv->headerbar);
++	} else {
++		gtk_container_add (GTK_CONTAINER (priv->box), priv->headerbar);
++
++		/* Need to hide toolbar when fullscreen (slideshow or normal fullscreen) */
++		g_signal_connect (window, "action-state-changed",
++				  G_CALLBACK (on_action_state_changed), window);
++	}
++	gtk_widget_show (priv->headerbar);
+ 
+ 	zoom_button = gtk_toggle_button_new ();
+ 	zoom_image = gtk_image_new_from_icon_name ("zoom-in-symbolic",
+@@ -4238,7 +4282,7 @@ eog_window_construct_ui (EogWindow *window)
+ 	g_signal_connect (zoom_button, "toggled",
+ 			  G_CALLBACK (eog_window_zoom_button_toggled_cb),
+ 			  window);
+-	gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar), zoom_button);
++	gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->headerbar), zoom_button);
+ 	/* disable zoom button if no image is loaded */
+ 	g_object_bind_property (g_action_map_lookup_action (G_ACTION_MAP(window),
+ 							    "zoom-normal"),
+@@ -4249,7 +4293,7 @@ eog_window_construct_ui (EogWindow *window)
+ 	priv->zoom_revealer = gtk_revealer_new ();
+ 	gtk_revealer_set_transition_type (GTK_REVEALER (priv->zoom_revealer),
+ 					  GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT);
+-	gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar),
++	gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->headerbar),
+ 				   priv->zoom_revealer);
+ 	gtk_widget_show (priv->zoom_revealer);
+ 
+@@ -4280,7 +4324,7 @@ eog_window_construct_ui (EogWindow *window)
+ 		gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
+ 						G_MENU_MODEL (builder_object));
+ 
+-		gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
++		gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), menu_button);
+ 		gtk_widget_show (menu_button);
+ 
+ 		builder_object = gtk_builder_get_object (builder, "open-with-menu");
+@@ -4297,7 +4341,7 @@ eog_window_construct_ui (EogWindow *window)
+ 					"win.view-fullscreen");
+ 	gtk_widget_set_tooltip_text(fullscreen_button,
+ 				    _("Show the current image in fullscreen mode"));
+-	gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), fullscreen_button);
++	gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), fullscreen_button);
+ 	gtk_widget_show (fullscreen_button);
+ 
+ 	priv->cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+-- 
+2.5.0
+
 
=== removed file 'debian/patches/disable-appmenu-when-not-needed.patch'
--- debian/patches/disable-appmenu-when-not-needed.patch	2015-09-21 10:53:08 +0000
+++ debian/patches/disable-appmenu-when-not-needed.patch	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-Description: Disables the application menu on platforms that show an app menu
-  and a menubar (such as unity). The menubar already contains all the actions of
-  the appmenu. Having both is redundant.
-Forwarded: doesn't make sense upstream until eog is ported to GMenuModel
-Author: Lars Uebernickel <[e-mail]>
-Index: eog-3.16.3/src/eog-application.c
-===================================================================
---- eog-3.16.3.orig/src/eog-application.c	2015-08-20 23:52:05.472049295 +0200
-+++ eog-3.16.3/src/eog-application.c	2015-08-20 23:52:05.472049295 +0200
-@@ -291,6 +291,8 @@
- 	GFile *css_file;
- 	GtkSettings *settings;
- 	GtkCssProvider *provider;
-+	gboolean shows_app_menu;
-+	gboolean shows_menubar;
- 
- 	G_APPLICATION_CLASS (eog_application_parent_class)->startup (application);
- 
-@@ -330,7 +332,13 @@
- 	              "gtk-application-prefer-dark-theme", TRUE,
- 	              NULL);
- 
--	eog_application_init_app_menu (app);
-+	g_object_get (gtk_settings_get_default (),
-+		      "gtk-shell-shows-app-menu", &shows_app_menu,
-+		      "gtk-shell-shows-menubar", &shows_menubar,
-+		      NULL);
-+
-+	if (shows_app_menu && !shows_menubar)
-+		eog_application_init_app_menu (EOG_APPLICATION (application));
- 	eog_application_init_accelerators (GTK_APPLICATION (app));
- 
- 	app->priv->extensions = peas_extension_set_new (
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-05-27 16:03:38 +0000
+++ debian/patches/series	2015-09-29 10:38:28 +0000
@@ -1,3 +1,2 @@
-disable-appmenu-when-not-needed.patch
-unity_traditional_titlebar.patch
-
+0001-Add-a-traditional-menu-bar.patch
+0002-Show-traditional-title-bar-in-unity.patch
 
=== removed file 'debian/patches/unity_traditional_titlebar.patch'
--- debian/patches/unity_traditional_titlebar.patch	2015-09-21 10:57:41 +0000
+++ debian/patches/unity_traditional_titlebar.patch	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-# Description: Show traditional titlebar under unity
-# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=749976
-#
-Index: b/src/eog-window.c
-===================================================================
---- a/src/eog-window.c
-+++ b/src/eog-window.c
-@@ -130,6 +130,7 @@
-         GtkWidget           *thumbview;
-         GtkWidget           *statusbar;
-         GtkWidget           *nav;
-+        GtkWidget           *headerbar;
- 	GtkWidget           *message_area;
- 	GtkWidget           *zoom_revealer;
- 	GtkWidget           *zoom_scale;
-@@ -4196,6 +4197,42 @@
- 	gtk_button_set_image (GTK_BUTTON (button), zoom_image);
- }
- 
-+static gboolean
-+in_desktop (const gchar *name)
-+{
-+	const gchar *desktop_name_list;
-+	gchar **names;
-+	gboolean in_list = FALSE;
-+	gint i;
-+
-+	desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP");
-+	if (!desktop_name_list)
-+		return FALSE;
-+
-+	names = g_strsplit (desktop_name_list, ":", -1);
-+	for (i = 0; names[i] && !in_list; i++)
-+		if (strcmp (names[i], name) == 0) {
-+			in_list = TRUE;
-+			break;
-+		}
-+	g_strfreev (names);
-+
-+	return in_list;
-+}
-+
-+static void
-+on_action_state_changed (GObject *object G_GNUC_UNUSED,
-+		GParamSpec *pspec G_GNUC_UNUSED,
-+		gpointer user_data)
-+{
-+	EogWindow *window = EOG_WINDOW (user_data);
-+	EogWindowPrivate *priv = window->priv;
-+
-+	gtk_widget_set_visible (GTK_WIDGET (priv->headerbar),
-+		priv->mode != EOG_WINDOW_MODE_FULLSCREEN &&
-+			priv->mode != EOG_WINDOW_MODE_SLIDESHOW);
-+}
-+
- static void
- eog_window_construct_ui (EogWindow *window)
- {
-@@ -4207,7 +4244,6 @@
- 
- 	GtkWidget *popup_menu;
- 	GtkWidget *hpaned;
--	GtkWidget *headerbar;
- 	GtkWidget *zoom_button;
- 	GtkWidget *zoom_image;
- 	GtkWidget *menu_button;
-@@ -4222,12 +4258,31 @@
- 	gtk_container_add (GTK_CONTAINER (window), priv->box);
- 	gtk_widget_show (priv->box);
- 
--	headerbar = gtk_header_bar_new ();
--	gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE);
--	gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
--				  g_get_application_name ());
--	gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
--	gtk_widget_show (headerbar);
-+	priv->headerbar = gtk_header_bar_new ();
-+	if (!in_desktop ("Unity")) {
-+		gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (priv->headerbar),
-+				TRUE);
-+		gtk_header_bar_set_title (GTK_HEADER_BAR (priv->headerbar),
-+					  g_get_application_name ());
-+		gtk_window_set_titlebar (GTK_WINDOW (window), priv->headerbar);
-+	} else {
-+		gtk_container_add (GTK_CONTAINER (priv->box), priv->headerbar);
-+
-+		/* Need to hide toolbar when fullscreen (slideshow or normal fullscreen) */
-+		action = g_action_map_lookup_action (G_ACTION_MAP (window),
-+				"view-fullscreen");
-+		g_signal_connect (action,
-+				"notify::state",
-+				G_CALLBACK (on_action_state_changed),
-+				window);
-+		action = g_action_map_lookup_action (G_ACTION_MAP (window),
-+				"view-slideshow");
-+		g_signal_connect (action,
-+				"notify::state",
-+				G_CALLBACK (on_action_state_changed),
-+				window);
-+	}
-+	gtk_widget_show (priv->headerbar);
- 
- 	zoom_button = gtk_toggle_button_new ();
- 	zoom_image = gtk_image_new_from_icon_name ("zoom-in-symbolic",
-@@ -4238,7 +4293,7 @@
- 	g_signal_connect (zoom_button, "toggled",
- 			  G_CALLBACK (eog_window_zoom_button_toggled_cb),
- 			  window);
--	gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar), zoom_button);
-+	gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->headerbar), zoom_button);
- 	/* disable zoom button if no image is loaded */
- 	g_object_bind_property (g_action_map_lookup_action (G_ACTION_MAP(window),
- 							    "zoom-normal"),
-@@ -4249,7 +4304,7 @@
- 	priv->zoom_revealer = gtk_revealer_new ();
- 	gtk_revealer_set_transition_type (GTK_REVEALER (priv->zoom_revealer),
- 					  GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT);
--	gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar),
-+	gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->headerbar),
- 				   priv->zoom_revealer);
- 	gtk_widget_show (priv->zoom_revealer);
- 
-@@ -4276,7 +4331,7 @@
- 	gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button),
- 					G_MENU_MODEL (builder_object));
- 
--	gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), menu_button);
-+	gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), menu_button);
- 	gtk_widget_show (menu_button);
- 
- 	fullscreen_button = gtk_button_new_from_icon_name ("view-fullscreen-symbolic",
-@@ -4285,7 +4340,7 @@
- 					"win.view-fullscreen");
- 	gtk_widget_set_tooltip_text(fullscreen_button,
- 				    _("Show the current image in fullscreen mode"));
--	gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), fullscreen_button);
-+	gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), fullscreen_button);
- 	gtk_widget_show (fullscreen_button);
- 
- 	priv->open_with_menu = g_menu_new ();