gtk+ r19514 - in branches/gtk-2-12: . gtk

[kristian svn gnome org]

Author: kristian
Date: Mon Feb 11 15:09:04 2008
New Revision: 19514
URL: http://svn.gnome.org/viewvc/gtk+?rev=19514&view=rev

Log:
2008-02-11  Kristian Rietveld  <kris imendio com>

	Merge from trunk:

	* 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:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkcellview.c
   branches/gtk-2-12/gtk/gtkiconview.c

Modified: branches/gtk-2-12/gtk/gtkcellview.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkcellview.c	(original)
+++ branches/gtk-2-12/gtk/gtkcellview.c	Mon Feb 11 15:09:04 2008
@@ -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: branches/gtk-2-12/gtk/gtkiconview.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkiconview.c	(original)
+++ branches/gtk-2-12/gtk/gtkiconview.c	Mon Feb 11 15:09:04 2008
@@ -4484,8 +4484,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);