diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-10-12 22:34:01 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-10-12 22:34:01 +0000 |
| commit | 28f18106e1f32b583ca4102bcc3f1186e895f765 (patch) | |
| tree | c7d6f7bc65f1ecd352cff8432ff5282096c5cebb /src/nautilus-window-menus.c | |
| parent | 77d9750dff5404da759e1d6dcb1bf45da7074739 (diff) | |
| download | nautilus-28f18106e1f32b583ca4102bcc3f1186e895f765.tar.gz | |
Fixed bug 3717 (Unchecking "show built-in bookmarks" doesn't
make them go away)
* src/nautilus-window-menus.c:
tweaked the names of a couple of #defines
(refresh_bookmarks_menu): Added parameter check.
(nautilus_window_remove_bookmarks_menu_items): Remove the
built-in bookmarks as well as the dynamic ones.
(nautilus_window_remove_go_menu_items), (append_dynamic_bookmarks),
(refresh_go_menu): Updated for #define name change.
Diffstat (limited to 'src/nautilus-window-menus.c')
| -rw-r--r-- | src/nautilus-window-menus.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index a06d57efc..388ca5dc0 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -77,10 +77,10 @@ #define NAUTILUS_MENU_PATH_SHOW_HIDE_LOCATION_BAR "/menu/View/Show Hide Placeholder/Show Hide Location Bar" #define NAUTILUS_MENU_PATH_SHOW_HIDE_STATUS_BAR "/menu/View/Show Hide Placeholder/Show Hide Status Bar" -#define NAUTILUS_MENU_PATH_HISTORY_ITEMS_PLACEHOLDER "/menu/Go/History Placeholder" +#define NAUTILUS_MENU_PATH_HISTORY_PLACEHOLDER "/menu/Go/History Placeholder" #define NAUTILUS_MENU_PATH_BUILT_IN_BOOKMARKS_PLACEHOLDER "/menu/Bookmarks/Built-in Bookmarks Placeholder" -#define NAUTILUS_MENU_PATH_BOOKMARK_ITEMS_PLACEHOLDER "/menu/Bookmarks/Bookmarks Placeholder" +#define NAUTILUS_MENU_PATH_BOOKMARKS_PLACEHOLDER "/menu/Bookmarks/Bookmarks Placeholder" #define NAUTILUS_MENU_PATH_SEPARATOR_BEFORE_BOOKMARKS "/menu/Bookmarks/Separator before Bookmarks" #define NAUTILUS_MENU_PATH_ABOUT_ITEM "/menu/Help/About Nautilus" @@ -1019,6 +1019,8 @@ edit_bookmarks (NautilusWindow *window) static void refresh_bookmarks_menu (NautilusWindow *window) { + g_assert (NAUTILUS_IS_WINDOW (window)); + /* Unregister any pending call to this function. */ nautilus_window_remove_bookmarks_menu_callback (window); @@ -1288,15 +1290,23 @@ nautilus_window_remove_go_menu_callback (NautilusWindow *window) void nautilus_window_remove_bookmarks_menu_items (NautilusWindow *window) { + /* FIXME bugzilla.eazel.com 3568: + * We leak the verbs when we remove the menu items. + */ nautilus_bonobo_remove_menu_items (window->details->shell_ui, - NAUTILUS_MENU_PATH_BOOKMARK_ITEMS_PLACEHOLDER); + NAUTILUS_MENU_PATH_BUILT_IN_BOOKMARKS_PLACEHOLDER); + nautilus_bonobo_remove_menu_items (window->details->shell_ui, + NAUTILUS_MENU_PATH_BOOKMARKS_PLACEHOLDER); } void nautilus_window_remove_go_menu_items (NautilusWindow *window) { + /* FIXME bugzilla.eazel.com 3568: + * We leak the verbs when we remove the menu items. + */ nautilus_bonobo_remove_menu_items (window->details->shell_ui, - NAUTILUS_MENU_PATH_HISTORY_ITEMS_PLACEHOLDER); + NAUTILUS_MENU_PATH_HISTORY_PLACEHOLDER); } void @@ -1336,7 +1346,7 @@ append_dynamic_bookmarks (NautilusWindow *window) name = g_strdup_printf ("Bookmark%d", index); append_bookmark_to_menu (window, nautilus_bookmark_list_item_at (bookmarks, index), - NAUTILUS_MENU_PATH_BOOKMARK_ITEMS_PLACEHOLDER, + NAUTILUS_MENU_PATH_BOOKMARKS_PLACEHOLDER, name, TRUE); g_free (name); @@ -1394,7 +1404,7 @@ refresh_go_menu (NautilusWindow *window) name = g_strdup_printf ("History%d", index); append_bookmark_to_menu (window, NAUTILUS_BOOKMARK (node->data), - NAUTILUS_MENU_PATH_HISTORY_ITEMS_PLACEHOLDER, + NAUTILUS_MENU_PATH_HISTORY_PLACEHOLDER, name, FALSE); g_free (name); |