Merge lp:~larsu/eog/add-disable-appmenu-patch into lp:~ubuntu-desktop/eog/ubuntu

[Lars Karlitski]

Add disable-appmenu-on-unity.patch

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.

[lp:~larsu/eog/add-disable-appmenu-patch]

148. By Lars Karlitski on 2014-03-11

disable-appmenu patch: add header

[Sebastien Bacher (seb128)]

That looks good, thanks!

review: Approve

=== added file 'debian/patches/disable-appmenu-on-unity.patch'
--- debian/patches/disable-appmenu-on-unity.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-appmenu-on-unity.patch	2014-03-11 10:45:12 +0000
@@ -0,0 +1,30 @@
+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]>
+diff --git a/src/eog-application.c b/src/eog-application.c
+index a77157a..c4f899d 100644
+--- a/src/eog-application.c
++++ b/src/eog-application.c
+@@ -225,9 +225,19 @@ eog_application_init_app_menu (EogApplication *application)
+ static void
+ eog_application_startup (GApplication *application)
+ {
++	gboolean shows_app_menu;
++	gboolean shows_menubar;
++
++	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));
++
+ 	G_APPLICATION_CLASS (eog_application_parent_class)->startup (application);
+ 
+-	eog_application_init_app_menu (EOG_APPLICATION (application));
+ }
+ 
+ static void

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-10 18:17:44 +0000
+++ debian/patches/series	2014-03-11 10:45:12 +0000
@@ -2,3 +2,4 @@
 03_unity_control_center.patch
 git_dialog_dont_lock.patch
 git_icc_color.patch
+disable-appmenu-on-unity.patch