diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-10-10 23:55:37 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-10-10 23:55:37 +0000 |
| commit | 4c0452586d083a4aebba4a9271db87e10b85b375 (patch) | |
| tree | 7fd6f075e28bc6b6dd236d2bd25483fa399d4ace /src/nautilus-window.c | |
| parent | 2526d55dc1d1b7d1455b3c175542681774e379ea (diff) | |
| download | nautilus-4c0452586d083a4aebba4a9271db87e10b85b375.tar.gz | |
Changed gnome-print to work at HEAD.
* README: Changed gnome-print to work at HEAD.
* src/file-manager/fm-icon-view.c: (handle_radio_item): Common
function shared by context menu and Bonobo menu.
(context_menu_layout_radio_item_callback): Use common function.
(append_one_context_menu_layout_item): Change from "verb" to "id".
(update_layout_menus): Set up proper radio button based on ids.
(switch_to_manual_layout): Renamed and changed from a callback to
a normal function.
(handle_ui_event): Signal handler to get Bonobo radio menu
choices.
(fm_icon_view_merge_menus): Connect UI event handler and remove
old code for radio menu items.
* src/file-manager/nautilus-icon-view-ui.xml: Add ids to the radio
menu items.
* src/nautilus-about.c: (nautilus_about_destroy),
(nautilus_about_initialize), (nautilus_about_repaint),
(draw_aa_string), (randomize_authors), (draw_author_list),
(nautilus_about_draw_info), (nautilus_about_update_authors),
(nautilus_about_close), (update_authors_if_necessary): Improve
randomizing algorithm, get rid of fixed maximum number of authors.
* src/nautilus-window.c: Cosmetic changes.
Diffstat (limited to 'src/nautilus-window.c')
| -rw-r--r-- | src/nautilus-window.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c index d98e2e3c7..c06800ca7 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -81,7 +81,7 @@ /* Milliseconds */ #define STATUS_BAR_CLEAR_TIMEOUT 5000 -/* GNOME Dock Items */ +/* dock items */ #define LOCATION_BAR_PATH "/Location Bar" #define TOOL_BAR_PATH "/Tool Bar" #define STATUS_BAR_PATH "/status" @@ -219,10 +219,11 @@ navigation_bar_mode_changed_callback (GtkWidget *widget, NautilusWindow *window) { nautilus_window_update_find_menu_item (window); - + window->details->updating_bonobo_state = TRUE; + g_assert (mode == NAUTILUS_SWITCHABLE_NAVIGATION_BAR_MODE_LOCATION - || mode == NAUTILUS_SWITCHABLE_NAVIGATION_BAR_MODE_SEARCH); + || mode == NAUTILUS_SWITCHABLE_NAVIGATION_BAR_MODE_SEARCH); /* FIXME: bugzilla.eazel.com 3590: * We shouldn't need a separate command for the toggle button and menu item. @@ -231,7 +232,7 @@ navigation_bar_mode_changed_callback (GtkWidget *widget, nautilus_bonobo_set_toggle_state (window->details->shell_ui, NAUTILUS_COMMAND_TOGGLE_FIND_MODE_WITH_STATE, mode == NAUTILUS_SWITCHABLE_NAVIGATION_BAR_MODE_SEARCH); - + window->details->updating_bonobo_state = FALSE; } |