projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
228a2c8
)
GBookmarkFile: Streamline error handling a bit
author
Matthias Clasen
<mclasen@redhat.com>
Tue, 31 Dec 2013 17:45:09 +0000
(12:45 -0500)
committer
Matthias Clasen
<mclasen@redhat.com>
Wed, 1 Jan 2014 22:59:22 +0000
(17:59 -0500)
glib/gbookmarkfile.c
patch
|
blob
|
history
diff --git
a/glib/gbookmarkfile.c
b/glib/gbookmarkfile.c
index
3c6d597
..
d244917
100644
(file)
--- a/
glib/gbookmarkfile.c
+++ b/
glib/gbookmarkfile.c
@@
-3527,7
+3527,6
@@
g_bookmark_file_move_item (GBookmarkFile *bookmark,
GError **error)
{
BookmarkItem *item;
GError **error)
{
BookmarkItem *item;
- GError *remove_error;
g_return_val_if_fail (bookmark != NULL, FALSE);
g_return_val_if_fail (old_uri != NULL, FALSE);
g_return_val_if_fail (bookmark != NULL, FALSE);
g_return_val_if_fail (old_uri != NULL, FALSE);
@@
-3546,14
+3545,8
@@
g_bookmark_file_move_item (GBookmarkFile *bookmark,
{
if (g_bookmark_file_has_item (bookmark, new_uri))
{
{
if (g_bookmark_file_has_item (bookmark, new_uri))
{
- remove_error = NULL;
- g_bookmark_file_remove_item (bookmark, new_uri, &remove_error);
- if (remove_error)
- {
- g_propagate_error (error, remove_error);
-
- return FALSE;
- }
+ if (!g_bookmark_file_remove_item (bookmark, new_uri, error))
+ return FALSE;
}
g_hash_table_steal (bookmark->items_by_uri, item->uri);
}
g_hash_table_steal (bookmark->items_by_uri, item->uri);
@@
-3568,14
+3561,8
@@
g_bookmark_file_move_item (GBookmarkFile *bookmark,
}
else
{
}
else
{
- remove_error = NULL;
- g_bookmark_file_remove_item (bookmark, old_uri, &remove_error);
- if (remove_error)
- {
- g_propagate_error (error, remove_error);
-
- return FALSE;
- }
+ if (!g_bookmark_file_remove_item (bookmark, old_uri, error))
+ return FALSE;
return TRUE;
}
return TRUE;
}