luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 01:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return a boolean instead of void.

Browse Source 
2006-06-12  Emmanuele Bassi  <ebassi@cvs.gnome.org>

	* glib/gbookmarkfile.h:
	* glib/gbookmarkfile.c (g_bookmark_file_remove_item): Return
	a boolean instead of void.

	* tests/bookmarkfile-test.c (test_modify): Add a test case
	for g_bookmark_file_remove_item().
This commit is contained in:
Emmanuele Bassi 2006-06-12 17:19:13 +00:00 committed by Emmanuele Bassi
parent e39b793341
commit cc37f43d1d
5 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2006-06-12 Emmanuele Bassi <ebassi@cvs.gnome.org>
* glib/gbookmarkfile.h:
* glib/gbookmarkfile.c (g_bookmark_file_remove_item): Return
a boolean instead of void.
* tests/bookmarkfile-test.c (test_modify): Add a test case
for g_bookmark_file_remove_item().
2006-06-12 Matthias Clasen <mclasen@redhat.com> 2006-06-12 Matthias Clasen <mclasen@redhat.com>
* Bump version * Bump version

9
ChangeLog.pre-2-12
View File

@ -1,3 +1,12 @@
2006-06-12 Emmanuele Bassi <ebassi@cvs.gnome.org>
* glib/gbookmarkfile.h:
* glib/gbookmarkfile.c (g_bookmark_file_remove_item): Return
a boolean instead of void.
* tests/bookmarkfile-test.c (test_modify): Add a test case
for g_bookmark_file_remove_item().
2006-06-12 Matthias Clasen <mclasen@redhat.com> 2006-06-12 Matthias Clasen <mclasen@redhat.com>
* Bump version * Bump version

12
glib/gbookmarkfile.c
View File

@ -2016,17 +2016,19 @@ g_bookmark_file_add_item (GBookmarkFile *bookmark,
* *
* Removes the bookmark for @uri from the bookmark file @bookmark. * Removes the bookmark for @uri from the bookmark file @bookmark.
* *
* Return value: %TRUE if the bookmark was removed successfully.
*
* Since: 2.12 * Since: 2.12
*/ */
void gboolean
g_bookmark_file_remove_item (GBookmarkFile *bookmark, g_bookmark_file_remove_item (GBookmarkFile *bookmark,
const gchar *uri, const gchar *uri,
GError **error) GError **error)
{ {
BookmarkItem *item; BookmarkItem *item;
g_return_if_fail (bookmark != NULL); g_return_val_if_fail (bookmark != NULL, FALSE);
g_return_if_fail (uri != NULL); g_return_val_if_fail (uri != NULL, FALSE);
item = g_bookmark_file_lookup_item (bookmark, uri); item = g_bookmark_file_lookup_item (bookmark, uri);
@ -2036,13 +2038,15 @@ g_bookmark_file_remove_item (GBookmarkFile *bookmark,
G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
_("No bookmark found for URI '%s'"), _("No bookmark found for URI '%s'"),
uri); uri);
return; return FALSE;
} }
bookmark->items = g_list_remove (bookmark->items, item); bookmark->items = g_list_remove (bookmark->items, item);
g_hash_table_remove (bookmark->items_by_uri, item->uri); g_hash_table_remove (bookmark->items_by_uri, item->uri);
bookmark_item_free (item); bookmark_item_free (item);
return TRUE;
} }
/** /**

2
glib/gbookmarkfile.h
View File

@ -174,7 +174,7 @@ gboolean g_bookmark_file_remove_application (GBookmarkFile *bookmark,
const gchar *uri, const gchar *uri,
const gchar *name, const gchar *name,
GError **error); GError **error);
void g_bookmark_file_remove_item (GBookmarkFile *bookmark, gboolean g_bookmark_file_remove_item (GBookmarkFile *bookmark,
const gchar *uri, const gchar *uri,
GError **error); GError **error);
gboolean g_bookmark_file_move_item (GBookmarkFile *bookmark, gboolean g_bookmark_file_move_item (GBookmarkFile *bookmark,

7
tests/bookmarkfile-test.c
View File

@ -194,6 +194,13 @@ test_modify (GBookmarkFile *bookmark)
g_assert (g_bookmark_file_has_group (bookmark, TEST_URI_1, "Fail", NULL) == FALSE); g_assert (g_bookmark_file_has_group (bookmark, TEST_URI_1, "Fail", NULL) == FALSE);
g_print ("ok\n"); g_print ("ok\n");
g_print ("\t=> check remove...");
g_assert (g_bookmark_file_remove_item (bookmark, TEST_URI_1, &error) == TRUE);
test_assert_empty_error (&error);
g_assert (g_bookmark_file_remove_item (bookmark, TEST_URI_1, &error) == FALSE);
test_assert_not_empty_error (&error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND);
g_print ("ok\n");
return TRUE; return TRUE;
} }