diff --git a/ChangeLog b/ChangeLog
index 9326833711..e3e8e98c76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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)
+
 2007-04-28  Matthias Clasen  <mclasen@redhat.com>
 	
 	* demos/gtk-demo/printing.c: Fix the headers in the print
diff --git a/gdk/win32/bdfcursor.c b/gdk/win32/bdfcursor.c
index e9d0e05206..8f75b3b489 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 4bb29410b0..b379446650 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4373,7 +4373,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 754d0cc36b..4398883712 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)
     {