ayatana-commits team mailing list archive

[David Barth <david.barth@xxxxxxxxxxxxx>]

David Barth has proposed merging lp:~dbarth/appmenu-gtk/local-fallback into lp:appmenu-gtk.

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


This patch along with a change to set show-local to FALSE in gtk by default prevents flicker at application startup, yet avoids being trapped with an menu-less application window.

To test:
1. remove the appmenu applet and unset APPMENU_DISPLAY_BOTH
2. run gedit, notice the menubar is displayed in the app. window itself
3. add the appmenu applet; confirm the embedded menubar goes away as the panel menubar appears
4. remove the appmenu applet; confirm the embedded menubar reappears

2nd phase:
1. make sure an appmenu applet is loaded and unset APPMENU_DISPLAY_BOTH
2. run gedit; notice that no embedded menubar appears anymore, hence suppressing the startup flicker from the previous patch


-- 
https://code.launchpad.net/~dbarth/appmenu-gtk/local-fallback/+merge/31311
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-07-26 13:25:05 +0000
+++ src/bridge.c	2010-07-29 17:47:57 +0000
@@ -285,7 +285,10 @@
       AppWindowContext *context = tmp->data;
       GtkWidget *widget = context->window;
 
-      if (!context->registered && context->server != NULL && context->root != NULL && GTK_IS_WINDOW (widget) && bridge->priv->appmenuproxy != NULL)
+	  if (bridge->priv->appmenuproxy == NULL || bridge->priv->online == FALSE)
+		  app_menu_bridge_set_show_local (context->bridge, TRUE);
+
+	  if (!context->registered && context->server != NULL && context->root != NULL && GTK_IS_WINDOW (widget) && bridge->priv->appmenuproxy != NULL)
         {
           org_ayatana_AppMenu_Registrar_register_window_async (bridge->priv->appmenuproxy,
                                                                   GDK_WINDOW_XID (gtk_widget_get_window (widget)),