Skip nonexistant bookmarks in menus/sidebar. Fixes #312507.

2005-10-18  Christian Neumair  <chris@gnome-de.org>

	* src/nautilus-places-sidebar.c: (update_places):
	* src/nautilus-window-bookmarks.c: (update_bookmarks):
	Skip nonexistant bookmarks in menus/sidebar. Fixes #312507.
This commit is contained in:
Christian Neumair 2005-10-18 15:44:29 +00:00 committed by Christian Neumair
parent a1e8e44293
commit f96e824b79
3 changed files with 19 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2005-10-18 Christian Neumair <chris@gnome-de.org>
* src/nautilus-places-sidebar.c: (update_places):
* src/nautilus-window-bookmarks.c: (update_bookmarks):
Skip nonexistant bookmarks in menus/sidebar. Fixes #312507.
2005-10-18 Christian Neumair <chris@gnome-de.org>
* libnautilus-private/nautilus-metafile.c: Make metadata

View file

@ -213,6 +213,10 @@ update_places (NautilusPlacesSidebar *sidebar)
for (index = 0; index < bookmark_count; ++index) {
bookmark = nautilus_bookmark_list_item_at (sidebar->bookmarks, index);
if (nautilus_bookmark_uri_known_not_to_exist (bookmark)) {
continue;
}
name = nautilus_bookmark_get_name (bookmark);
icon = nautilus_bookmark_get_icon (bookmark);
mount_uri = nautilus_bookmark_get_uri (bookmark);

View file

@ -202,6 +202,7 @@ static void
update_bookmarks (NautilusWindow *window)
{
NautilusBookmarkList *bookmarks;
NautilusBookmark *bookmark;
guint bookmark_count;
guint index;
GtkUIManager *ui_manager;
@ -225,9 +226,15 @@ update_bookmarks (NautilusWindow *window)
/* append new set of bookmarks */
bookmark_count = nautilus_bookmark_list_length (bookmarks);
for (index = 0; index < bookmark_count; ++index) {
bookmark = nautilus_bookmark_list_item_at (bookmarks, index);
if (nautilus_bookmark_uri_known_not_to_exist (bookmark)) {
continue;
}
nautilus_menus_append_bookmark_to_menu
(NAUTILUS_WINDOW (window),
nautilus_bookmark_list_item_at (bookmarks, index),
(NAUTILUS_WINDOW (window),
bookmark,
NAUTILUS_WINDOW_GET_CLASS (window)->bookmarks_placeholder,
"dynamic",
index,