gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-29 20:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

bookmarks: remove unused methods

Browse source
This commit is contained in:
Cosimo Cecchi 2012-10-19 15:34:27 -04:00
parent 0cd6b88fff
commit 380124b5cf
6 changed files with 7 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libnautilus-private/nautilus-bookmark.c
View file

@ -640,32 +640,6 @@ nautilus_bookmark_compare_with (gconstpointer a, gconstpointer b)
return 0;
}
/**
* nautilus_bookmark_compare_uris:
*
* Check whether the uris of two bookmarks are for the same location.
* @a: first NautilusBookmark*.
* @b: second NautilusBookmark*.
*
* Return value: 0 if @a and @b have matching uri, 1 otherwise
* (GCompareFunc style)
**/
int
nautilus_bookmark_compare_uris (gconstpointer a, gconstpointer b)
{
NautilusBookmark *bookmark_a;
NautilusBookmark *bookmark_b;
g_return_val_if_fail (NAUTILUS_IS_BOOKMARK (a), 1);
g_return_val_if_fail (NAUTILUS_IS_BOOKMARK (b), 1);
bookmark_a = NAUTILUS_BOOKMARK (a);
bookmark_b = NAUTILUS_BOOKMARK (b);
return !g_file_equal (bookmark_a->details->location,
bookmark_b->details->location);
}
GIcon *
nautilus_bookmark_get_symbolic_icon (NautilusBookmark *bookmark)
{

2
libnautilus-private/nautilus-bookmark.h
View file

@ -77,8 +77,6 @@ void nautilus_bookmark_set_custom_name (NautilusBookmark
const char *new_name);
int nautilus_bookmark_compare_with (gconstpointer a,
gconstpointer b);
int nautilus_bookmark_compare_uris (gconstpointer a,
gconstpointer b);
void nautilus_bookmark_set_scroll_pos (NautilusBookmark *bookmark,
const char *uri);

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

@ -251,32 +251,15 @@ nautilus_bookmark_list_append (NautilusBookmarkList *bookmarks,
g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
g_return_if_fail (NAUTILUS_IS_BOOKMARK (bookmark));
if (g_list_find_custom (bookmarks->list, bookmark,
nautilus_bookmark_compare_with) != NULL) {
return;
}
insert_bookmark_internal (bookmarks, g_object_ref (bookmark), -1);
nautilus_bookmark_list_save_file (bookmarks);
}
/**
* nautilus_bookmark_list_contains:
*
* Check whether a bookmark with matching name and url is already in the list.
* @bookmarks: NautilusBookmarkList to check contents of.
* @bookmark: NautilusBookmark to match against.
*
* Return value: TRUE if matching bookmark is in list, FALSE otherwise
**/
gboolean
nautilus_bookmark_list_contains (NautilusBookmarkList *bookmarks,
NautilusBookmark *bookmark)
{
g_return_val_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks), FALSE);
g_return_val_if_fail (NAUTILUS_IS_BOOKMARK (bookmark), FALSE);
return g_list_find_custom (bookmarks->list,
(gpointer)bookmark,
nautilus_bookmark_compare_with)
!= NULL;
}
/**
* nautilus_bookmark_list_delete_item_at:
*
@ -334,44 +317,6 @@ nautilus_bookmark_list_move_item (NautilusBookmarkList *bookmarks,
nautilus_bookmark_list_save_file (bookmarks);
}
/**
* nautilus_bookmark_list_delete_items_with_uri:
*
* Delete all bookmarks with the given uri.
* @bookmarks: the list of bookmarks.
* @uri: The uri to match.
**/
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) {
next = node->next;
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);
list_changed = TRUE;
}
g_free (bookmark_uri);
}
if (list_changed) {
nautilus_bookmark_list_save_file (bookmarks);
}
}
/**
* nautilus_bookmark_list_insert_item:
*

4
src/nautilus-bookmark-list.h
View file

@ -63,12 +63,8 @@ GType nautilus_bookmark_list_get_type (void);
NautilusBookmarkList * nautilus_bookmark_list_new (void);
void nautilus_bookmark_list_append (NautilusBookmarkList *bookmarks,
NautilusBookmark *bookmark);
gboolean nautilus_bookmark_list_contains (NautilusBookmarkList *bookmarks,
NautilusBookmark *bookmark);
void nautilus_bookmark_list_delete_item_at (NautilusBookmarkList *bookmarks,
guint index);
void nautilus_bookmark_list_delete_items_with_uri (NautilusBookmarkList *bookmarks,
const char *uri);
void nautilus_bookmark_list_insert_item (NautilusBookmarkList *bookmarks,
NautilusBookmark *bookmark,
guint index);

5
src/nautilus-places-sidebar.c
View file

@ -1877,10 +1877,7 @@ add_bookmark (NautilusPlacesSidebar *sidebar)
location = g_file_new_for_uri (uri);
bookmark = nautilus_bookmark_new (location, name);
if (!nautilus_bookmark_list_contains (sidebar->bookmarks, bookmark)) {
nautilus_bookmark_list_append (sidebar->bookmarks, bookmark);
}
nautilus_bookmark_list_append (sidebar->bookmarks, bookmark);
g_object_unref (location);
g_object_unref (bookmark);

4
src/nautilus-window-menus.c
View file

@ -318,9 +318,7 @@ action_add_bookmark_callback (GtkAction *action,
bookmark = slot->current_location_bookmark;
list = nautilus_application_get_bookmarks (app);
if (!nautilus_bookmark_list_contains (list, bookmark)) {
nautilus_bookmark_list_append (list, bookmark);
}
nautilus_bookmark_list_append (list, bookmark);
}
static void