luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-22 15:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bookmarkfile-self-move' into 'master'

Browse Source 
bookmarkfile: Don't move an item if the uri has not changed

Closes #1588

See merge request GNOME/glib!456
This commit is contained in:
Philip Withnall 2018-11-06 12:21:19 +00:00
commit a3ad5a2ce0
2 changed files with 349 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gbookmarkfile.c
View File

@ -3584,6 +3584,9 @@ g_bookmark_file_move_item (GBookmarkFile *bookmark,
if (new_uri && new_uri[0] != '\0') if (new_uri && new_uri[0] != '\0')
{ {
if (g_strcmp0 (old_uri, new_uri) == 0)
return TRUE;
if (g_bookmark_file_has_item (bookmark, new_uri)) if (g_bookmark_file_has_item (bookmark, new_uri))
{ {
if (!g_bookmark_file_remove_item (bookmark, new_uri, error)) if (!g_bookmark_file_remove_item (bookmark, new_uri, error))

7
glib/tests/bookmarkfile.c
View File

@ -94,6 +94,13 @@ test_move_item (void)
g_assert (res); g_assert (res);
g_assert_no_error (error); g_assert_no_error (error);
res = g_bookmark_file_move_item (bookmark,
"file:///tmp/schedule.ps",
"file:///tmp/schedule.ps",
&error);
g_assert (res);
g_assert_no_error (error);
res = g_bookmark_file_move_item (bookmark, res = g_bookmark_file_move_item (bookmark,
"file:///no-such-file.xbel", "file:///no-such-file.xbel",
"file:///tmp/schedule.ps", "file:///tmp/schedule.ps",