Merge lp:~mterry/unity/never-stop-oh-never-stop-the-scrubbing into lp:unity

[Michael Terry]

This branch lets the panel service handle IndicatorObjectEntries without menus gracefully. This is follow on work from an indicator-appmenu fix [1].

Basically, if the panel service finds itself with a menu-less entry, it previously halted a scrub in its tracks. To avoid that, I just create a dummy GtkMenu for the duration of the scrub.

In practice, we should rarely if ever hit this. But for the moment, when an application swaps out a toplevel menu, indicator-appmenu is able to remove it, but not put the new one in place. So you'll see this, for example, in empathy, if you open a contact window and scrub across the "Contact" menu item. You'll need [1] though or you'll just crash instead.

[1] https://code.launchpad.net/~mterry/indicator-appmenu/fix-empathy-contact-crash/+merge/47579

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2010-12-29 17:30:12 +0000
+++ services/panel-service.c	2011-01-26 19:58:23 +0000
@@ -977,10 +977,25 @@
       priv->last_menu_button = 0;
     }
 
-  if (entry != NULL && GTK_IS_MENU (entry->menu))
+  if (entry != NULL)
     {
+      if (GTK_IS_MENU (entry->menu))
+        {
+          priv->last_menu = entry->menu;
+        }
+      else
+        {
+          /* For some reason, this entry doesn't have a menu.  To simplify the
+             rest of the code and to keep scrubbing fluidly, we'll create a
+             stub menu for the duration of this scrub. */
+          priv->last_menu = GTK_MENU (gtk_menu_new ());
+          g_signal_connect (priv->last_menu, "deactivate",
+                            G_CALLBACK (gtk_widget_destroy), NULL);
+          g_signal_connect (priv->last_menu, "destroy",
+                            G_CALLBACK (gtk_widget_destroyed), &priv->last_menu);
+        }
+
       priv->last_entry = entry;
-      priv->last_menu = entry->menu;
       priv->last_x = x;
       priv->last_y = y;
       priv->last_menu_button = button;