summaryrefslogtreecommitdiff
path: root/src/nautilus-navigation-window.h
diff options
context:
space:
mode:
authorRamiro Estrugo <ramiro@src.gnome.org>2000-05-31 13:07:05 +0000
committerRamiro Estrugo <ramiro@src.gnome.org>2000-05-31 13:07:05 +0000
commit93e47686fd33ae07029aa6739f65522d8a6e7c8b (patch)
treebc38f9e0bd89329fec8e43e5d299b2b413cef57a /src/nautilus-navigation-window.h
parentf2fda23a104e6e0376cef1ca5b81a894fad36a5c (diff)
downloadnautilus-93e47686fd33ae07029aa6739f65522d8a6e7c8b.tar.gz
Remove the user level pane from the preferences dialog. Place the
user level choices directly in the settings menu. Also uncouple user level from preferences. User level is no longer a preference itself. * libnautilus-extensions/nautilus-global-preferences.c: (global_preferences_create_dialog), (global_preferences_register_for_ui), (user_level_changed_callback), (nautilus_global_preferences_shutdown), (nautilus_global_preferences_startup): Remove all of the user level ui stuff. * nautilus-widgets/nautilus-user-level-manager.c: (user_level_manager_new), (nautilus_user_level_manager_initialize), (nautilus_user_level_manager_initialize_class), (user_level_manager_destroy), (gconf_get_user_level_string), (user_level_set_default_if_needed), (gconf_user_level_changed_callback), (nautilus_user_level_manager_get), (nautilus_user_level_manager_set_user_level), (nautilus_user_level_manager_get_user_level): Emit the the "user_level_changed" signal from a gconf callback instead of "by hand". Otherwise we are out of whack because of gconf asyncness. * src/nautilus-window-menus.c: (settings_menu_user_level_radio_group_callback), (settings_menu_user_level_customize_callback), (settings_menu_customize_callback), (nautilus_window_initialize_menus), (user_level_menu_path_to_user_level), (user_level_user_level_to_menu_path): * src/nautilus-window.h: Remove the "General Settings" menu item. Replace it with a user level chooser as well as current user level customizer.
Diffstat (limited to 'src/nautilus-navigation-window.h')
-rw-r--r--src/nautilus-navigation-window.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h
index e60afc64d..a87d20fc4 100644
--- a/src/nautilus-navigation-window.h
+++ b/src/nautilus-navigation-window.h
@@ -72,6 +72,9 @@ struct _NautilusWindow {
BonoboUIHandler *uih;
BonoboObject *app;
+ /* FIXME bugzilla.eazel.com 916: Workaround for Bonobo bug. */
+ gboolean updating_bonobo_radio_menu_item;
+
/** State information **/
/* Information about current location/selection */