r44197 - in /desktop/experimental/eog/debian: changelog patches/disable-appmenu-when-not-needed.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Apr  1 16:47:05 2015
New Revision: 44197

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44197
Log:
disable-appmenu-when-not-needed.patch: Take a patch from Ubuntu to disable
the app menu when we're showing the traditional menu, which has all of the
same actions.

Added:
    desktop/experimental/eog/debian/patches/disable-appmenu-when-not-needed.patch
Modified:
    desktop/experimental/eog/debian/changelog
    desktop/experimental/eog/debian/patches/series

Modified: desktop/experimental/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/changelog?rev=44197&op=diff
==============================================================================
--- desktop/experimental/eog/debian/changelog	[utf-8] (original)
+++ desktop/experimental/eog/debian/changelog	[utf-8] Wed Apr  1 16:47:05 2015
@@ -3,6 +3,9 @@
   * New upstream release 3.14.4, fixing bug:
     + eog crashes when attempting two-finger zoom gesture on touchpad (LP:
     #1436920)
+  * disable-appmenu-when-not-needed.patch: Take a patch from Ubuntu to disable
+    the app menu when we're showing the traditional menu, which has all of the
+    same actions.
 
  -- Iain Lane <laney at debian.org>  Wed, 01 Apr 2015 16:11:14 +0100
 

Added: desktop/experimental/eog/debian/patches/disable-appmenu-when-not-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/patches/disable-appmenu-when-not-needed.patch?rev=44197&op=file
==============================================================================
--- desktop/experimental/eog/debian/patches/disable-appmenu-when-not-needed.patch	(added)
+++ desktop/experimental/eog/debian/patches/disable-appmenu-when-not-needed.patch	[utf-8] Wed Apr  1 16:47:05 2015
@@ -0,0 +1,33 @@
+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 <lars.uebernickel at canonical.com>
+Index: b/src/eog-application.c
+===================================================================
+--- a/src/eog-application.c
++++ b/src/eog-application.c
+@@ -256,6 +256,8 @@
+ 	GFile *css_file;
+ 	GtkSettings *settings;
+ 	GtkCssProvider *provider;
++	gboolean shows_app_menu;
++	gboolean shows_menubar;
+ 
+ 	G_APPLICATION_CLASS (eog_application_parent_class)->startup (application);
+ 
+@@ -295,7 +297,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));
+ 
+ 	app->priv->extensions = peas_extension_set_new (
+ 				   PEAS_ENGINE (app->priv->plugin_engine),

Modified: desktop/experimental/eog/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/patches/series?rev=44197&op=diff
==============================================================================
--- desktop/experimental/eog/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/eog/debian/patches/series	[utf-8] Wed Apr  1 16:47:05 2015
@@ -0,0 +1 @@
+disable-appmenu-when-not-needed.patch