ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/appmenu-gtk/force-sensitivity-updates into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)
Related bugs:
  #603479 Menu items not insensitive/disabled after application start
  https://bugs.launchpad.net/bugs/603479

-- 
https://code.launchpad.net/~bratsche/appmenu-gtk/force-sensitivity-updates/+merge/33475
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-08-13 14:09:30 +0000
+++ src/bridge.c	2010-08-24 00:02:41 +0000
@@ -304,10 +304,10 @@
       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)),
-                                                                  context->path,
-                                                                  register_application_window_cb,
-                                                                  context);
+                                                               GDK_WINDOW_XID (gtk_widget_get_window (widget)),
+                                                               context->path,
+                                                               register_application_window_cb,
+                                                               context);
         }
     }
 }
@@ -743,6 +743,18 @@
       if (increment)
         recurse->count++;
 
+      if (recurse->count == 0 && GTK_IS_MENU_BAR (widget))
+        {
+          GList *children = gtk_container_get_children (GTK_CONTAINER (widget));
+
+          for (; children != NULL; children = children->next)
+            {
+              gtk_menu_shell_activate_item (GTK_MENU_SHELL (widget),
+                                            children->data,
+                                            TRUE);
+            }
+        }
+
       if (recurse->count > -1 && increment)
         {
           /* If this is a separator, find out if we've already displayed a visible separator during