Don't leak list of children. (#140523)

2004-04-19  Morten Welinder  <terra@gnome.org>

	* gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
	children.  (#140523)

diff --git a/ChangeLog b/ChangeLog
index e79f1c674fe5be60aa0d4376c5856e6435b67c3d..7836c18b93389232efec005838a9337bff646fb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-19  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
+       children.  (#140523)
+
 2004-04-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e79f1c674fe5be60aa0d4376c5856e6435b67c3d..7836c18b93389232efec005838a9337bff646fb7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-04-19  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
+       children.  (#140523)
+
 2004-04-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e79f1c674fe5be60aa0d4376c5856e6435b67c3d..7836c18b93389232efec005838a9337bff646fb7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-04-19  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
+       children.  (#140523)
+
 2004-04-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e79f1c674fe5be60aa0d4376c5856e6435b67c3d..7836c18b93389232efec005838a9337bff646fb7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-04-19  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
+       children.  (#140523)
+
 2004-04-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e79f1c674fe5be60aa0d4376c5856e6435b67c3d..7836c18b93389232efec005838a9337bff646fb7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-04-19  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_focus): Don't leak list of
+       children.  (#140523)
+
 2004-04-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): 

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 56dd4ca4954cbd4f2158b916d4559fc5d160981a..6bc61aa4136d58966bc399d4c6668845afc90379 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1743,7 +1743,8 @@ gtk_toolbar_focus (GtkWidget        *widget,
 {
   GtkToolbar *toolbar = GTK_TOOLBAR (widget);
   GList *children, *list;
-  
+  gboolean result = FALSE;
+
   /* if focus is already somewhere inside the toolbar then return FALSE.
    * The only way focus can stay inside the toolbar is when the user presses
    * arrow keys or Ctrl TAB (both of which are handled by the
@@ -1751,20 +1752,23 @@ gtk_toolbar_focus (GtkWidget        *widget,
    */
   if (GTK_CONTAINER (widget)->focus_child)
     return FALSE;
-  
+
   children = gtk_toolbar_list_children_in_focus_order (toolbar, dir);
-  
+
   for (list = children; list != NULL; list = list->next)
     {
       GtkWidget *child = list->data;
       
       if (GTK_WIDGET_MAPPED (child) && gtk_widget_child_focus (child, dir))
-       return TRUE;
+       {
+         result = TRUE;
+         break;
+       }
     }
-  
+
   g_list_free (children);
-  
-  return FALSE;
+
+  return result;
 }
 
 static void