ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/appmenu-gtk/display-both into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)

-- 
https://code.launchpad.net/~bratsche/appmenu-gtk/display-both/+merge/26954
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-06-01 22:22:13 +0000
+++ src/bridge.c	2010-06-07 14:59:19 +0000
@@ -45,6 +45,7 @@
                                             GtkWidget         *shell,
                                             GtkWidget         *child,
                                             guint              position);
+static gboolean app_menu_bridge_show_local (GtkMenuProxy      *proxy);
 
 struct _AppMenuBridgePrivate
 {
@@ -87,6 +88,7 @@
   object_class = G_OBJECT_CLASS (class);
 
   proxy_class->insert = app_menu_bridge_insert;
+  proxy_class->show_local = app_menu_bridge_show_local;
 
   object_class->finalize = app_menu_bridge_finalize;
 
@@ -357,6 +359,14 @@
     }
 }
 
+static gboolean
+app_menu_bridge_show_local (GtkMenuProxy *proxy)
+{
+  const gchar *env = g_getenv ("APPMENU_DISPLAY_BOTH");
+
+  return (g_strcmp0 (env, "1") == 0);
+}
+
 G_MODULE_EXPORT void
 menu_proxy_module_load (GtkMenuProxyModule *module)
 {