diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-04-28 14:43:20 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-04-28 14:43:20 +0000 |
| commit | 28ec7761eeb159b937675ac88962dbffc23d5fb0 (patch) | |
| tree | 6e6a6a6cfa05af0111326792edaa73913ad28298 | |
| parent | 3ebb7e964c2bd1d7a979ce1a00e948b8bad65638 (diff) | |
| download | gdk-pixbuf-28ec7761eeb159b937675ac88962dbffc23d5fb0.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gdk/win32/bdfcursor.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcombobox.c | 2 | ||||
| -rw-r--r-- | gtk/gtkfilesystemmodel.c | 4 |
4 files changed, 14 insertions, 4 deletions
@@ -1,5 +1,15 @@ 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: * demos/gtk-demo/printing.c: Fix the headers in the print diff --git a/gdk/win32/bdfcursor.c b/gdk/win32/bdfcursor.c index e9d0e0520..8f75b3b48 100644 --- a/gdk/win32/bdfcursor.c +++ b/gdk/win32/bdfcursor.c @@ -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; diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 9124c289a..8cf10603f 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -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); diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 754d0cc36..439888371 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -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) { |