Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from trunk:

Browse Source 
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.


svn path=/branches/gtk-2-12/; revision=19514
This commit is contained in:
Kristian Rietveld
2008-02-11 15:09:04 +00:00
committed by Kristian Rietveld
parent 43f4ac3029
commit ffdd1deed6
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
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.
2008-02-11 Emmanuele Bassi <ebassi@gnome.org>
Merge from trunk:

2
gtk/gtkcellview.c
View File

@@ -735,7 +735,7 @@ gtk_cell_view_cell_layout_reorder (GtkCellLayout *layout,
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);

4
gtk/gtkiconview.c
View File

@@ -4484,8 +4484,8 @@ gtk_icon_view_cell_layout_reorder (GtkCellLayout *layout,
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);