diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 8 | ||||
| -rw-r--r-- | glib/gbookmarkfile.c | 14 |
3 files changed, 25 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2006-06-09 Emmanuele Bassi <ebassi@cvs.gnome.org> + + * glib/gbookmarkfile.c (g_bookmark_file_remove_application): Use + an empty string to pass the test in set_app_info. + + (g_bookmark_file_move_item): Remove the old item from the + look up table; return success in case of empty target. + 2006-06-08 Tor Lillqvist <tml@novell.com> * glib/gunicollate.c (msc_strxfrm_wrapper): Workaround for bug in diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b3315300c..861bde104 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2006-06-09 Emmanuele Bassi <ebassi@cvs.gnome.org> + + * glib/gbookmarkfile.c (g_bookmark_file_remove_application): Use + an empty string to pass the test in set_app_info. + + (g_bookmark_file_move_item): Remove the old item from the + look up table; return success in case of empty target. + 2006-06-08 Tor Lillqvist <tml@novell.com> * glib/gunicollate.c (msc_strxfrm_wrapper): Workaround for bug in diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c index 8385518ec..889937f2b 100644 --- a/glib/gbookmarkfile.c +++ b/glib/gbookmarkfile.c @@ -3084,7 +3084,7 @@ g_bookmark_file_remove_application (GBookmarkFile *bookmark, set_error = NULL; retval = g_bookmark_file_set_app_info (bookmark, uri, name, - NULL, + "", 0, (time_t) -1, &set_error); @@ -3509,7 +3509,7 @@ g_bookmark_file_move_item (GBookmarkFile *bookmark, g_return_val_if_fail (bookmark != NULL, FALSE); g_return_val_if_fail (old_uri != NULL, FALSE); - + item = g_bookmark_file_lookup_item (bookmark, old_uri); if (!item) { @@ -3533,11 +3533,15 @@ g_bookmark_file_move_item (GBookmarkFile *bookmark, return FALSE; } } + + g_hash_table_steal (bookmark->items_by_uri, item->uri); g_free (item->uri); item->uri = g_strdup (new_uri); item->modified = time (NULL); - + + g_hash_table_replace (bookmark->items_by_uri, item->uri, item); + return TRUE; } else @@ -3550,9 +3554,9 @@ g_bookmark_file_move_item (GBookmarkFile *bookmark, return FALSE; } + + return TRUE; } - - return FALSE; } /** |