diff options
| author | Christian Neumair <chris@gnome-de.org> | 2005-10-18 15:44:29 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2005-10-18 15:44:29 +0000 |
| commit | f96e824b79186614b23c410e61c1c52377703305 (patch) | |
| tree | 5e8912a99e5b6fcf578b05e5b1e47537c875c169 | |
| parent | a1e8e44293b8e395cdc3669acaef2241ae61be63 (diff) | |
| download | nautilus-f96e824b79186614b23c410e61c1c52377703305.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/nautilus-places-sidebar.c | 4 | ||||
| -rw-r--r-- | src/nautilus-window-bookmarks.c | 11 |
3 files changed, 19 insertions, 2 deletions
@@ -1,5 +1,11 @@ 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 copying/moving asynchronous. diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c index f592e3661..5c29d3e36 100644 --- a/src/nautilus-places-sidebar.c +++ b/src/nautilus-places-sidebar.c @@ -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); diff --git a/src/nautilus-window-bookmarks.c b/src/nautilus-window-bookmarks.c index dc9ca23b0..f60a33cd6 100644 --- a/src/nautilus-window-bookmarks.c +++ b/src/nautilus-window-bookmarks.c @@ -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, |