diff options
author | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-05-30 16:13:13 +0000 |
---|---|---|
committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-05-30 16:13:13 +0000 |
commit | 3058e232dcdce302e57287a46d79b254abd16865 (patch) | |
tree | 9f1f1b76f117049c2110da38b75c8e824d9e9a29 /libnautilus-extensions/nautilus-preferences.c | |
parent | b78f346574803ac7abb8654fc21a651af448f98c (diff) | |
download | nautilus-3058e232dcdce302e57287a46d79b254abd16865.tar.gz |
Instead of creating our own gconf client, share one with the user level
* nautilus-widgets/nautilus-preferences.c:
(nautilus_preferences_initialize):
Instead of creating our own gconf client, share one with the user
level manager. Otherwise i get weird gconf connection errors.
* nautilus-widgets/nautilus-user-level-manager.c:
(user_level_manager_new),
(nautilus_user_level_manager_initialize_class),
(user_level_manager_ensure_global_manager),
(user_level_set_default_if_needed),
(nautilus_user_level_manager_get),
(nautilus_user_level_manager_get_user_level),
(nautilus_user_level_manager_get_user_level_names),
(nautilus_user_level_manager_get_gconf_client):
* nautilus-widgets/nautilus-user-level-manager.h:
Add method to expose a refed gconf client.
Change the global manager initialization code to prevent stoopid
infinite loop. Let gconf know about the ~/.gconf/nautilus
directory.
Diffstat (limited to 'libnautilus-extensions/nautilus-preferences.c')
-rw-r--r-- | libnautilus-extensions/nautilus-preferences.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libnautilus-extensions/nautilus-preferences.c b/libnautilus-extensions/nautilus-preferences.c index 84918c8ba..965cd7d79 100644 --- a/libnautilus-extensions/nautilus-preferences.c +++ b/libnautilus-extensions/nautilus-preferences.c @@ -26,6 +26,7 @@ #include <string.h> #include "nautilus-preferences.h" +#include "nautilus-user-level-manager.h" #include <libnautilus-extensions/nautilus-gtk-macros.h> #include <libnautilus-extensions/nautilus-glib-extensions.h> @@ -929,16 +930,10 @@ nautilus_preferences_initialize (int argc, char **argv) g_assert (GLOBAL.preference_table != NULL); - GLOBAL.gconf_client = gconf_client_new (); + GLOBAL.gconf_client = GCONF_CLIENT (nautilus_user_level_manager_get_gconf_client ()); g_assert (GLOBAL.gconf_client != NULL); - /* Let gconf know about ~/.gconf/nautilus so that callbacks work */ - gconf_client_add_dir (GLOBAL.gconf_client, - PREFERENCES_GCONF_PATH, - GCONF_CLIENT_PRELOAD_RECURSIVE, - NULL); - return TRUE; } |