[maemo-commits] [maemo-commits] r15167 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2008-02-11 17:20:27 +0200 (Mon, 11 Feb 2008)
New Revision: 15167

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkcellview.c
   projects/haf/trunk/gtk+/gtk/gtkiconview.c
   projects/haf/trunk/gtk+/gtk/gtktreeviewcolumn.c
Log:
2008-02-11  Kristian Rietveld  <kris at imendio.com>

	Merge from upstream, fixes NB#78606:

        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_reorder):

        Plug leak: When reordering the info in the list the old node is
        removed but not freed. (#503569)

        * gtk/gtkcellview.c (gtk_cell_view_cell_layout_reorder)
        * gtk/gtkiconview.c (gtk_icon_view_cell_layout_reorder): plug leak
        wrt. link deletion from list; contination of fix for #503569.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-02-11 13:35:27 UTC (rev 15166)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-02-11 15:20:27 UTC (rev 15167)
@@ -1,5 +1,18 @@
 2008-02-11  Kristian Rietveld  <kris at imendio.com>
 
+	Merge from upstream, fixes NB#78606:
+
+        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_reorder):
+
+        Plug leak: When reordering the info in the list the old node is
+        removed but not freed. (#503569)
+
+        * gtk/gtkcellview.c (gtk_cell_view_cell_layout_reorder)
+        * gtk/gtkiconview.c (gtk_icon_view_cell_layout_reorder): plug leak
+        wrt. link deletion from list; contination of fix for #503569.
+
+2008-02-11  Kristian Rietveld  <kris at imendio.com>
+
 	* gdk/gdk.h
 	* gdk/gdkdisplay.c (gdk_close_all_temporary_windows): fix prototypes,
 	silences gcc when compiling with -Wstrict-prototypes. (MB#2493,

Modified: projects/haf/trunk/gtk+/gtk/gtkcellview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcellview.c	2008-02-11 13:35:27 UTC (rev 15166)
+++ projects/haf/trunk/gtk+/gtk/gtkcellview.c	2008-02-11 15:20:27 UTC (rev 15167)
@@ -735,7 +735,7 @@
 
   g_return_if_fail (link != NULL);
 
-  cellview->priv->cell_list = g_list_remove_link (cellview->priv->cell_list,
+  cellview->priv->cell_list = g_list_delete_link (cellview->priv->cell_list,
                                                   link);
   cellview->priv->cell_list = g_list_insert (cellview->priv->cell_list,
                                              info, position);

Modified: projects/haf/trunk/gtk+/gtk/gtkiconview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkiconview.c	2008-02-11 13:35:27 UTC (rev 15166)
+++ projects/haf/trunk/gtk+/gtk/gtkiconview.c	2008-02-11 15:20:27 UTC (rev 15167)
@@ -4481,8 +4481,8 @@
 
   g_return_if_fail (link != NULL);
 
-  icon_view->priv->cell_list = g_list_remove_link (icon_view->priv->cell_list,
-                                                  link);
+  icon_view->priv->cell_list = g_list_delete_link (icon_view->priv->cell_list,
+                                                   link);
   icon_view->priv->cell_list = g_list_insert (icon_view->priv->cell_list,
                                              info, position);
 

Modified: projects/haf/trunk/gtk+/gtk/gtktreeviewcolumn.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeviewcolumn.c	2008-02-11 13:35:27 UTC (rev 15166)
+++ projects/haf/trunk/gtk+/gtk/gtktreeviewcolumn.c	2008-02-11 15:20:27 UTC (rev 15167)
@@ -760,7 +760,7 @@
 
   g_return_if_fail (link != NULL);
 
-  column->cell_list = g_list_remove_link (column->cell_list, link);
+  column->cell_list = g_list_delete_link (column->cell_list, link);
   column->cell_list = g_list_insert (column->cell_list, info, position);
 
   if (column->tree_view)