Merge lp:~townsend/unity/fix-lp913324-5.0 into lp:unity/5.0

[Christopher Townsend]

Reference the menu in the accessible object. Backport of revno. 2775 of lp:unity.

Reference the menu in the accessible object. Backport of revno. 2775 of lp:unity. See https://code.launchpad.net/~ted/unity/menu-ref/+merge/127055 for more detail.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== 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	2013-10-17 19:25:25 +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;