Merge lp:~apinheiro/unity/Bug817477 into lp:unity

[Alejandro Piñeiro]

In the end the solution was one line. panel_indicator_entry_accessible_ref_child is a implementation of atk_object_ref_child, and as the name implies, it supposes that a reference count is required.

This branch also some NULL check conditions that I started to add while triagging the bug. It is really tied to this and I really think that doesn't hurt. Anyway if you prefer just add that g_object_ref I'm ok to add a new bug

[Neil J. Patel (njpatel)]

Looks good to me

review: Approve

=== modified file 'services/panel-indicator-accessible.c'
--- services/panel-indicator-accessible.c	2011-03-15 10:57:34 +0000
+++ services/panel-indicator-accessible.c	2011-09-02 15:02:24 +0000
@@ -93,21 +93,51 @@
 {
   GSList *l;
   PanelIndicatorAccessible *pia = PANEL_INDICATOR_ACCESSIBLE (user_data);
+  gboolean found = FALSE;
+  AtkObject *entry_accessible = NULL;
+  AtkObject *widget_accessible = NULL;
 
   for (l = pia->priv->a11y_children; l != NULL; l = l->next)
     {
-      AtkObject *accessible = ATK_OBJECT (l->data);
+      entry_accessible = ATK_OBJECT (l->data);
 
-      if (entry == panel_indicator_entry_accessible_get_entry (PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible)))
+      if (entry == panel_indicator_entry_accessible_get_entry (PANEL_INDICATOR_ENTRY_ACCESSIBLE (entry_accessible)))
         {
-          if (GTK_IS_LABEL (entry->label))
-            atk_object_set_name (accessible, gtk_label_get_text (GTK_LABEL (entry->label)));
-          else if (GTK_IS_IMAGE (entry->image))
-            atk_object_set_name (accessible, atk_object_get_name (ATK_OBJECT (entry->image)));
-          atk_object_set_description (accessible, entry->accessible_desc);
+          found = TRUE;
           break;
         }
     }
+
+  if (!found)
+    return;
+
+  if (GTK_IS_LABEL (entry->label))
+    {
+      widget_accessible = gtk_widget_get_accessible (GTK_WIDGET (entry->label));
+    }
+  else if (GTK_IS_IMAGE (entry->image))
+    {
+      widget_accessible = gtk_widget_get_accessible (GTK_WIDGET (entry->image));
+    }
+  else
+    {
+      g_warning ("a11y: Current entry is not a label or a image.");
+    }
+
+  if (ATK_IS_OBJECT (widget_accessible))
+    {
+      gchar *name = (gchar*) atk_object_get_name (widget_accessible);
+      gchar *description = (gchar*) entry->accessible_desc;
+
+      if (name == NULL)
+        name = "";
+
+      if (description == NULL)
+        description = "";
+
+      atk_object_set_name (entry_accessible, name);
+      atk_object_set_description (entry_accessible, description);
+    }
 }
 
 static void
@@ -290,11 +320,11 @@
   /* Setup the indicator object */
   pia->priv->indicator = g_object_ref (data);
   g_signal_connect (G_OBJECT (pia->priv->indicator), "entry-added",
-		    G_CALLBACK (on_indicator_entry_added), pia);
+                    G_CALLBACK (on_indicator_entry_added), pia);
   g_signal_connect (G_OBJECT (pia->priv->indicator), "entry-removed",
-		    G_CALLBACK (on_indicator_entry_removed), pia);
+                    G_CALLBACK (on_indicator_entry_removed), pia);
   g_signal_connect (G_OBJECT (pia->priv->indicator), "accessible_desc_update",
-		    G_CALLBACK (on_accessible_desc_updated), pia);
+                    G_CALLBACK (on_accessible_desc_updated), pia);
 
   /* Retrieve all entries and create their accessible objects */
   entries = indicator_object_get_entries (pia->priv->indicator);

=== modified file 'services/panel-indicator-entry-accessible.c'
--- services/panel-indicator-entry-accessible.c	2011-03-15 10:57:34 +0000
+++ services/panel-indicator-entry-accessible.c	2011-09-02 15:02:24 +0000
@@ -240,7 +240,8 @@
 	}
     }
 
-  atk_object_set_description (accessible, piea->priv->entry->accessible_desc);
+  if (piea->priv->entry->accessible_desc != NULL)
+    atk_object_set_description (accessible, piea->priv->entry->accessible_desc);
 }
 
 static gint
@@ -273,7 +274,10 @@
       atk_object_set_parent (child, accessible);
     }
 
-  return child;
+  if (child != NULL)
+    return g_object_ref (child);
+  else
+    return NULL;
 }
 
 static AtkStateSet *