Plug a couple of leaks when removing data from a bookmark.

2006-08-08  Emmanuele Bassi  <ebassi@gnome.org>

	* glib/gbookmarkfile.c (g_bookmark_file_remove_group)
	(g_bookmark_file_set_app_info): Plug a couple of leaks
	when removing data from a bookmark.

diff --git a/ChangeLog b/ChangeLog
index 1d93229..b637d4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-08  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * glib/gbookmarkfile.c (g_bookmark_file_remove_group)
+       (g_bookmark_file_set_app_info): Plug a couple of leaks
+       when removing data from a bookmark.
+
 2006-08-05  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gbookmarkfile.c (find_file_in_data_dirs): Correct the

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1d93229..b637d4c 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2006-08-08  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * glib/gbookmarkfile.c (g_bookmark_file_remove_group)
+       (g_bookmark_file_set_app_info): Plug a couple of leaks
+       when removing data from a bookmark.
+
 2006-08-05  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gbookmarkfile.c (find_file_in_data_dirs): Correct the

diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index fb67f09..a79eb54 100644 (file)
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -2842,7 +2842,8 @@ g_bookmark_file_remove_group (GBookmarkFile  *bookmark,
       if (strcmp (l->data, group) == 0)
         {
           item->metadata->groups = g_list_remove_link (item->metadata->groups, l);
-          g_list_free_1 (l);
+          g_free (l->data);
+         g_list_free_1 (l);
           
           item->modified = time (NULL);          
           
@@ -3248,7 +3249,8 @@ g_bookmark_file_set_app_info (GBookmarkFile  *bookmark,
     {
       item->metadata->applications = g_list_remove (item->metadata->applications, ai);
       g_hash_table_remove (item->metadata->apps_by_name, ai->name);
-          
+      bookmark_app_info_free (ai);
+
       item->modified = time (NULL);
           
       return TRUE;