Merge lp:~ted/unity/menu-ref into lp:unity

[Ted Gould]

Reference the menu in the accessible object

The quick summary is that IndicatorObjectEntry should really be an object. But it's not. So that means we can't have a proper lifecycle for it, and thus we can end up with distruction race conditions. The bug attached finds one. We only really need the menu in that case, so we can keep a reference to that and it'll be cleaned up a little bit later. Not ideal, but fixing all of libindicator is out-of-scope and it is causing a crash for real users.

[Marco Trevisan (Treviño) (3v1n0)]

Mh, this g_clear_object(&piea->priv->menu); seems to be really aggressive if someone else needs that menu... Just unreffing it is not enough?

[Marco Trevisan (Treviño) (3v1n0)]

> Mh, this g_clear_object(&piea->priv->menu); seems to be really aggressive if
> someone else needs that menu... Just unreffing it is not enough?

Oh, sorry, I misread the pointer, I tought you were acting on the entry itself...
So, that's fine.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1422/console reported an error when processing this lp:~ted/unity/menu-ref branch.
Not merging it.

[Ted Gould (ted)]

Looks like a packaging depends blip. Remarking approved to try again.

=== modified file 'services/panel-indicator-entry-accessible.c'
--- services/panel-indicator-entry-accessible.c	2012-03-20 16:59:23 +0000
+++ services/panel-indicator-entry-accessible.c	2012-09-28 19:47:23 +0000
@@ -30,6 +30,7 @@
 struct _PanelIndicatorEntryAccessiblePrivate
 {
   IndicatorObjectEntry *entry;
+  GtkMenu *             menu;
   PanelService         *service;
   gint                  x;
   gint                  y;
@@ -111,6 +112,25 @@
 }
 
 static void
+panel_indicator_entry_accessible_dispose (GObject *object)
+{
+  PanelIndicatorEntryAccessible *piea;
+
+  g_return_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (object));
+
+  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (object);
+
+  if (piea->priv != NULL)
+    {
+      piea->priv->entry = NULL;
+      g_clear_object(&piea->priv->menu);
+    }
+
+  G_OBJECT_CLASS (panel_indicator_entry_accessible_parent_class)->dispose (object);
+  return;
+}
+
+static void
 panel_indicator_entry_accessible_finalize (GObject *object)
 {
   PanelIndicatorEntryAccessible *piea;
@@ -136,6 +156,7 @@
 
   /* GObject */
   object_class = G_OBJECT_CLASS (klass);
+  object_class->dispose = panel_indicator_entry_accessible_dispose;
   object_class->finalize = panel_indicator_entry_accessible_finalize;
 
   /* AtkObject */
@@ -225,6 +246,10 @@
 
   piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
   piea->priv->entry = (IndicatorObjectEntry *) data;
+  if (piea->priv->entry->menu != NULL)
+    {
+      piea->priv->menu = g_object_ref(piea->priv->entry->menu);
+    }
 
   if (GTK_IS_LABEL (piea->priv->entry->label))
     {
@@ -253,7 +278,7 @@
 
   piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
 
-  if (piea->priv->entry->parent_object && GTK_IS_MENU (piea->priv->entry->menu))
+  if (piea->priv->entry != NULL && piea->priv->entry->parent_object && piea->priv->menu != NULL && GTK_IS_MENU (piea->priv->menu))
     n_children = 1;
 
   return n_children;