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

[Alejandro Piñeiro]

The error was on the callback for "entry-removed". The accessible object for the indicator maintains a list of the accessible objects for each entry. When a entry is removed this list is updated, and requires to navigate on the list to check which is the entry removed and get the index.

The error was that removed the list, but the loop keep iterating over the list, and with and outdated iterator. The solution was just getting out of the loop and remove the element after that.

I also fixed a leak on two _finalize methods, as those removed the contents but not the list itself, and making things more complex (g_slist_free_full is just one line).

[Neil J. Patel (njpatel)]

Looks good, approved.

review: Approve

=== modified file 'services/panel-indicator-accessible.c'
--- services/panel-indicator-accessible.c	2011-09-02 14:56:07 +0000
+++ services/panel-indicator-accessible.c	2011-10-05 16:58:24 +0000
@@ -72,19 +72,30 @@
   GSList *l;
   guint count = 0;
   PanelIndicatorAccessible *pia = PANEL_INDICATOR_ACCESSIBLE (user_data);
+  gboolean found = FALSE;
+  AtkObject *accessible = NULL;
 
-  for (l = pia->priv->a11y_children; l != NULL; l = l->next, count++)
+  for (l = pia->priv->a11y_children; l != NULL; l = g_slist_next (l))
     {
-      AtkObject *accessible = ATK_OBJECT (l->data);
+      accessible = ATK_OBJECT (l->data);
 
       if (entry == panel_indicator_entry_accessible_get_entry (PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible)))
         {
-	  pia->priv->a11y_children = g_slist_remove (pia->priv->a11y_children, accessible);
-	  g_signal_emit_by_name (ATK_OBJECT (pia), "children-changed::remove",
-				 count, accessible);
-
-	  g_object_unref (accessible);
+          found = TRUE;
+          break;
 	}
+      else
+        count++;
+    }
+
+
+  if (found)
+    {
+      pia->priv->a11y_children = g_slist_remove (pia->priv->a11y_children, accessible);
+      g_signal_emit_by_name (ATK_OBJECT (pia), "children-changed::remove",
+                             count, accessible);
+
+      g_object_unref (accessible);
     }
 }
 
@@ -214,12 +225,10 @@
           g_object_unref (G_OBJECT (pia->priv->indicator));
         }
 
-      while (pia->priv->a11y_children != NULL)
+      if (pia->priv->a11y_children != NULL)
         {
-	  AtkObject *accessible = ATK_OBJECT (pia->priv->a11y_children->data);
-
-	  pia->priv->a11y_children = g_slist_remove (pia->priv->a11y_children, accessible);
-	  g_object_unref (accessible);
+          g_slist_free_full(pia->priv->a11y_children, g_object_unref);
+          pia->priv->a11y_children = NULL;
 	}
 
       g_signal_handlers_disconnect_by_func (pia->priv->service, on_geometries_changed_cb, pia);

=== modified file 'services/panel-root-accessible.c'
--- services/panel-root-accessible.c	2011-09-03 16:01:33 +0000
+++ services/panel-root-accessible.c	2011-10-05 16:58:24 +0000
@@ -42,15 +42,10 @@
 {
   PanelRootAccessible *root = PANEL_ROOT_ACCESSIBLE (object);
 
-  if (root->priv != NULL)
+  if ((root->priv != NULL) && (root->priv->a11y_children != NULL))
     {
-      while (root->priv->a11y_children != NULL)
-        {
-	  AtkObject *accessible = ATK_OBJECT (root->priv->a11y_children->data);
-
-	  root->priv->a11y_children = g_slist_remove (root->priv->a11y_children, accessible);
-	  g_object_unref (accessible);
-	}
+      g_slist_free_full(root->priv->a11y_children, g_object_unref);
+      root->priv->a11y_children = NULL;
     }
 }