bookmark-list: use internal list for clients

So we will be able to remove some of the public API, since we
can use GList functions.

3 files changed, 19 insertions, 5 deletions

diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index 3a59d292a..3e482c988 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -703,3 +703,17 @@ nautilus_bookmark_list_new (void)
 
 	return list;
 }
+
+/**
+ * nautilus_bookmark_list_get_all:
+ *
+ * Get a GList of all NautilusBookmark.
+ * @bookmarks: NautilusBookmarkList from where to get the bookmarks.
+ **/
+GList *
+nautilus_bookmark_list_get_all (NautilusBookmarkList *bookmarks)
+{
+       g_return_val_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks), NULL);
+
+       return bookmarks->list;
+}
diff --git a/src/nautilus-bookmark-list.h b/src/nautilus-bookmark-list.h
index 475a35b86..3faf15b2a 100644
--- a/src/nautilus-bookmark-list.h
+++ b/src/nautilus-bookmark-list.h
@@ -78,5 +78,6 @@ void                    nautilus_bookmark_list_move_item           (NautilusBook
 								    guint                 destination);
 gboolean                nautilus_bookmark_list_can_bookmark_location (NautilusBookmarkList *list,
 								      GFile                *location);
+GList *                 nautilus_bookmark_list_get_all             (NautilusBookmarkList   *bookmarks);
 
 #endif /* NAUTILUS_BOOKMARK_LIST_H */
diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
index a2b596d4f..2148e7a49 100644
--- a/src/nautilus-shell-search-provider.c
+++ b/src/nautilus-shell-search-provider.c
@@ -256,7 +256,6 @@ search_add_volumes_and_bookmarks (PendingSearch *search)
   NautilusSearchHit *hit;
   NautilusBookmark *bookmark;
   const gchar *name;
-  gint length, idx;
   gchar *string, *uri;
   gdouble match;
   GList *l, *m, *drives, *volumes, *mounts, *mounts_to_check, *candidates;
@@ -266,17 +265,17 @@ search_add_volumes_and_bookmarks (PendingSearch *search)
   GFile *location;
   SearchHitCandidate *candidate;
   NautilusBookmarkList *bookmarks;
+  GList *all_bookmarks;
   GVolumeMonitor *volume_monitor;
 
   bookmarks = nautilus_application_get_bookmarks (NAUTILUS_APPLICATION (g_application_get_default ()));
+  all_bookmarks = nautilus_bookmark_list_get_all (bookmarks);
   volume_monitor = g_volume_monitor_get ();
   candidates = NULL;
 
   /* first add bookmarks */
-  length = nautilus_bookmark_list_length (bookmarks);
-  for (idx = 0; idx < length; idx++) {
-    bookmark = nautilus_bookmark_list_item_at (bookmarks, idx);
-
+  for (l = all_bookmarks; l != NULL; l = l->next) {
+    bookmark = NAUTILUS_BOOKMARK (l->data);
     name = nautilus_bookmark_get_name (bookmark);
     if (name == NULL)
       continue;