diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-08-07 22:17:35 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-08-07 22:17:35 +0000 |
| commit | ebf2649bd10109a7cfee201b012fbd1add840515 (patch) | |
| tree | 61e0016cd64ea3a2d04556929a5938456a23783f | |
| parent | 0bc9a1062930c6145eb5b8a8f68efcc897a6eb6f (diff) | |
| download | nautilus-ebf2649bd10109a7cfee201b012fbd1add840515.tar.gz | |
Fixed bug 1979 (Crash involving bookmarks)
Gene did all the hard work of finding a reproducible case
for this. From there it was easy for me to fix the bug
in code I wrote. He gets 3/4 of all klocs assigned for
this bug.
* src/nautilus-window-menus.c:
(nautilus_window_remove_bookmarks_menu_items):
Set last_static_bookmark_path to NULL after removing menu
items from bookmarks menu.
(refresh_all_bookmarks):
Call nautilus_window_remove_bookmarks_menu_items instead
of lower-level remove_bookmarks_after.
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | src/nautilus-navigation-window-menus.c | 6 | ||||
| -rw-r--r-- | src/nautilus-window-menus.c | 6 |
3 files changed, 24 insertions, 7 deletions
@@ -1,3 +1,20 @@ +2000-08-07 John Sullivan <sullivan@eazel.com> + + Fixed bug 1979 (Crash involving bookmarks) + + Gene did all the hard work of finding a reproducible case + for this. From there it was easy for me to fix the bug + in code I wrote. He gets 3/4 of all klocs assigned for + this bug. + + * src/nautilus-window-menus.c: + (nautilus_window_remove_bookmarks_menu_items): + Set last_static_bookmark_path to NULL after removing menu + items from bookmarks menu. + (refresh_all_bookmarks): + Call nautilus_window_remove_bookmarks_menu_items instead + of lower-level remove_bookmarks_after. + Mon Aug 07 14:47:28 2000 George Lebl <jirka@5z.com> * libnautilus-extensions/nautilus-list-column-title.c @@ -29,7 +46,7 @@ Mon Aug 07 14:47:28 2000 George Lebl <jirka@5z.com> (nautilus_get_largest_fitting_font): Change the number of sizes to choose from to 4 (from 5). Also, - remove the 28 size which is usually available. This size is what + remove the 28 size which is usually unavailable. This size is what was causing the ugliness in the font. * src/nautilus-sidebar-title.c: (update_font): diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c index 2b2f96f1d..3a5e91de5 100644 --- a/src/nautilus-navigation-window-menus.c +++ b/src/nautilus-navigation-window-menus.c @@ -886,9 +886,7 @@ edit_bookmarks (NautilusWindow *window) static void refresh_all_bookmarks (NautilusWindow *window) { - remove_bookmarks_after (window, - NAUTILUS_MENU_PATH_BOOKMARKS_MENU, - NAUTILUS_MENU_PATH_EDIT_BOOKMARKS_ITEM); + nautilus_window_remove_bookmarks_menu_items (window); if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BUILT_IN_BOOKMARKS, TRUE)) { @@ -1431,6 +1429,8 @@ nautilus_window_remove_bookmarks_menu_items (NautilusWindow *window) remove_bookmarks_after (window, NAUTILUS_MENU_PATH_BOOKMARKS_MENU, NAUTILUS_MENU_PATH_EDIT_BOOKMARKS_ITEM); + + window->details->last_static_bookmark_path = NULL; } void diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index 2b2f96f1d..3a5e91de5 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -886,9 +886,7 @@ edit_bookmarks (NautilusWindow *window) static void refresh_all_bookmarks (NautilusWindow *window) { - remove_bookmarks_after (window, - NAUTILUS_MENU_PATH_BOOKMARKS_MENU, - NAUTILUS_MENU_PATH_EDIT_BOOKMARKS_ITEM); + nautilus_window_remove_bookmarks_menu_items (window); if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BUILT_IN_BOOKMARKS, TRUE)) { @@ -1431,6 +1429,8 @@ nautilus_window_remove_bookmarks_menu_items (NautilusWindow *window) remove_bookmarks_after (window, NAUTILUS_MENU_PATH_BOOKMARKS_MENU, NAUTILUS_MENU_PATH_EDIT_BOOKMARKS_ITEM); + + window->details->last_static_bookmark_path = NULL; } void |