Don't leak the list of children (#357454, Paolo Borelli)

2006-09-25  Matthias Clasen  <mclasen@redhat.com>
        * gtk/gtkuimanager.c (_gtk_menu_is_empty): Don't leak
        the list of children (#357454, Paolo Borelli)

diff --git a/ChangeLog b/ChangeLog
index b35671aa96cfec72bdff3fff8f2fe8b7343ce713..a8d7a2a6316b49bc5199f7905fc3fda0a4445bac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.c (_gtk_menu_is_empty): Don't leak
+       the list of children (#357454, Paolo Borelli)
+
 2006-09-25  Michael Natterer  <mitch@imendio.com>
 
        * gdk/x11/gdkdisplay-x11.c (gdk_display_x11_finalize): free

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 5f82e2b435336d4664640fcf324df9b83c5a4b90..8a3685f76ea06f39460168dec2f5cf5d0a000519 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -1941,6 +1941,7 @@ gboolean
 _gtk_menu_is_empty (GtkWidget *menu)
 {
   GList *children, *cur;
+  gboolean result = TRUE;
 
   g_return_val_if_fail (menu == NULL || GTK_IS_MENU (menu), TRUE);
 
@@ -1956,13 +1957,16 @@ _gtk_menu_is_empty (GtkWidget *menu)
        {
          if (!GTK_IS_TEAROFF_MENU_ITEM (cur->data) &&
              !g_object_get_data (cur->data, "gtk-empty-menu-item"))
-           return FALSE;
+            {
+             result = FALSE;
+              break;
+            }
        }
       cur = cur->next;
     }
   g_list_free (children);
 
-  return TRUE;
+  return result;
 }
 
 enum {