Merge lp:~charlesk/unity-gtk-module/lp-1199123 into lp:unity-gtk-module/13.10

[Charles Kerr]

in lib/unity-gtk-menu-shell.c's unity_gtk_menu_shell_get_items(), plug a GList leak.

in lib/unity-gtk-menu-shell.c's unity_gtk_menu_shell_get_items(), plug a GList leak.

[William Hua (attente)]

Thanks for the catch!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:299
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-armhf-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-gtk-module-ci/14/rebuild

review: Approve (continuous-integration)

=== modified file 'lib/unity-gtk-menu-shell.c'
--- lib/unity-gtk-menu-shell.c	2013-02-19 11:55:57 +0000
+++ lib/unity-gtk-menu-shell.c	2013-07-08 19:56:33 +0000
@@ -121,19 +121,22 @@
 
   if (shell->items == NULL)
     {
+      GList *children;
       GList *iter;
       guint i;
 
       g_return_val_if_fail (shell->menu_shell != NULL, NULL);
 
       shell->items = g_ptr_array_new_with_free_func (g_object_unref);
-      iter = gtk_container_get_children (GTK_CONTAINER (shell->menu_shell));
+      children = gtk_container_get_children (GTK_CONTAINER (shell->menu_shell));
 
-      for (i = 0; iter != NULL; i++)
+      for (iter = children, i = 0; iter != NULL; i++)
         {
           g_ptr_array_add (shell->items, unity_gtk_menu_item_new (iter->data, shell, i));
           iter = g_list_next (iter);
         }
+
+      g_list_free (children);
     }
 
   return shell->items;