gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-04 19:08:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

bookmark-list: Modernize old-new code

Browse source 
There is no need to use g_list_free_1() when we can achieve the same
result using g_list_delete_link() instead of g_list_remove_link().

There is also no need to free 1 link when it can be reinserted in
another position.

Also other style rearrangements, mixing declarations with code, etc.
This commit is contained in:
António Fernandes 2024-05-22 23:41:15 +01:00
parent f92141abb8
commit 1ff52d2e46
1 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/nautilus-bookmark-list.c
View file

@ -332,8 +332,7 @@ nautilus_bookmark_list_contains (NautilusBookmarkList *bookmarks,
return g_list_find_custom (bookmarks->list,
(gpointer) bookmark,
nautilus_bookmark_compare_with)
!= NULL;
nautilus_bookmark_compare_with) != NULL;
}
/**
@ -347,19 +346,16 @@ void
nautilus_bookmark_list_delete_item_at (NautilusBookmarkList *bookmarks,
guint index)
{
GList *doomed;
g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
g_return_if_fail (index < g_list_length (bookmarks->list));
doomed = g_list_nth (bookmarks->list, index);
bookmarks->list = g_list_remove_link (bookmarks->list, doomed);
GList *doomed = g_list_nth (bookmarks->list, index);
g_assert (NAUTILUS_IS_BOOKMARK (doomed->data));
stop_monitoring_bookmark (bookmarks, NAUTILUS_BOOKMARK (doomed->data));
g_object_unref (doomed->data);
g_list_free_1 (doomed);
bookmarks->list = g_list_delete_link (bookmarks->list, doomed);
nautilus_bookmark_list_save_file (bookmarks);
}
@ -376,22 +372,21 @@ nautilus_bookmark_list_move_item (NautilusBookmarkList *bookmarks,
guint index,
guint destination)
{
GList *bookmark_item;
if (index == destination)
{
return;
}
bookmark_item = g_list_nth (bookmarks->list, index);
GList *link_to_move = g_list_nth (bookmarks->list, index);
bookmarks->list = g_list_remove_link (bookmarks->list,
bookmark_item);
link_to_move);
bookmarks->list = g_list_insert (bookmarks->list,
bookmark_item->data,
destination);
g_list_free_1 (bookmark_item);
GList *link_at_destination = g_list_nth (bookmarks->list, destination);
/* NULL link at destination means end of the list */
bookmarks->list = g_list_insert_before_link (bookmarks->list,
link_at_destination,
link_to_move);
nautilus_bookmark_list_save_file (bookmarks);
}
@ -407,28 +402,25 @@ void
nautilus_bookmark_list_delete_items_with_uri (NautilusBookmarkList *bookmarks,
const char *uri)
{
GList *node, *next;
gboolean list_changed;
char *bookmark_uri;
g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
g_return_if_fail (uri != NULL);
list_changed = FALSE;
for (node = bookmarks->list; node != NULL; node = next)
gboolean list_changed = FALSE;
GList *next = NULL;
for (GList *node = bookmarks->list; node != NULL; node = next)
{
next = node->next;
bookmark_uri = nautilus_bookmark_get_uri (NAUTILUS_BOOKMARK (node->data));
g_autofree char *bookmark_uri = nautilus_bookmark_get_uri (NAUTILUS_BOOKMARK (node->data));
if (g_strcmp0 (bookmark_uri, uri) == 0)
{
bookmarks->list = g_list_remove_link (bookmarks->list, node);
stop_monitoring_bookmark (bookmarks, NAUTILUS_BOOKMARK (node->data));
g_object_unref (node->data);
g_list_free_1 (node);
bookmarks->list = g_list_delete_link (bookmarks->list, node);
list_changed = TRUE;
}
g_free (bookmark_uri);
}
if (list_changed)