Plug memory leaks caused by wrong use of g_slist_remove_link(). (#405515,

2007-04-28  Matthias Clasen  <mclasen@redhat.com>

        * gdk/win32/bdfcursor.c (compose_cursors_from_fonts):
        * gtk/gtkcombobox.c (gtk_combo_box_cell_layout_reorder):
        * gtk/gtkfilesystemmodel.c (got_root_folder_cb):
        (get_children_folder_cb): Plug memory leaks caused by wrong
        use of g_slist_remove_link().  (#405515, Nicolas Peninguy)



svn path=/branches/gtk-2-10/; revision=17672
This commit is contained in:
Matthias Clasen
2007-04-28 14:43:20 +00:00
committed by Matthias Clasen
parent 3ebb7e964c
commit 28ec7761ee
4 changed files with 14 additions and 4 deletions

View File

@@ -1,3 +1,13 @@
2007-04-28 Matthias Clasen <mclasen@redhat.com>
Merge from trunk
* gdk/win32/bdfcursor.c (compose_cursors_from_fonts):
* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_reorder):
* gtk/gtkfilesystemmodel.c (got_root_folder_cb):
(get_children_folder_cb): Plug memory leaks caused by wrong
use of g_slist_remove_link(). (#405515, Nicolas Peninguy)
2007-04-28 Matthias Clasen <mclasen@redhat.com>
Merge from trunk:

View File

@@ -279,7 +279,7 @@ static void compose_cursors_from_fonts()
{
GSList *l;
for (l = g_slist_copy(fonts); l; l = g_slist_remove_link(l,l))
for (l = g_slist_copy (fonts); l; l = g_slist_delete_link (l,l))
{
font_info_t *fi = l->data;
gchar *name;

View File

@@ -4288,7 +4288,7 @@ gtk_combo_box_cell_layout_reorder (GtkCellLayout *layout,
g_return_if_fail (link != NULL);
combo_box->priv->cells = g_slist_remove_link (combo_box->priv->cells, link);
combo_box->priv->cells = g_slist_delete_link (combo_box->priv->cells, link);
combo_box->priv->cells = g_slist_insert (combo_box->priv->cells, info,
position);

View File

@@ -615,7 +615,7 @@ got_root_folder_cb (GtkFileSystemHandle *handle,
if (!tmp_list)
goto out;
model->pending_handles = g_slist_remove_link (model->pending_handles,
model->pending_handles = g_slist_delete_link (model->pending_handles,
tmp_list);
if (cancelled || !folder)
@@ -1528,7 +1528,7 @@ get_children_get_folder_cb (GtkFileSystemHandle *handle,
if (!tmp_list)
goto out;
data->model->pending_handles = g_slist_remove_link (data->model->pending_handles, tmp_list);
data->model->pending_handles = g_slist_delete_link (data->model->pending_handles, tmp_list);
if (cancelled || !folder)
{