Commit ba852fa3 authored by Ramiro Estrugo's avatar Ramiro Estrugo

No longer need to retrieve the gconf_client from the user level manager.

* nautilus-widgets/nautilus-preferences.c:
(nautilus_preferences_initialize):
* nautilus-widgets/nautilus-user-level-manager.c:
* nautilus-widgets/nautilus-user-level-manager.h:
No longer need to retrieve the gconf_client from the user level
manager.  The bug preventing multiple clients has been fixed in gconf.
parent 98bf8d77
2000-06-02 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-widgets/nautilus-preferences.c:
(nautilus_preferences_initialize):
* nautilus-widgets/nautilus-user-level-manager.c:
* nautilus-widgets/nautilus-user-level-manager.h:
No longer need to retrieve the gconf_client from the user level
manager. The bug preventing multiple clients has been fixed in
gconf.
2000-06-02 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus-extensions/nautilus-global-preferences.c:
......
......@@ -930,7 +930,13 @@ nautilus_preferences_initialize (int argc, char **argv)
g_assert (GLOBAL.preference_table != NULL);
GLOBAL.gconf_client = GCONF_CLIENT (nautilus_user_level_manager_get_gconf_client ());
GLOBAL.gconf_client = gconf_client_new ();
/* Let gconf know about ~/.gconf/nautilus */
gconf_client_add_dir (GLOBAL.gconf_client,
PREFERENCES_GCONF_PATH,
GCONF_CLIENT_PRELOAD_RECURSIVE,
NULL);
g_assert (GLOBAL.gconf_client != NULL);
......
......@@ -328,18 +328,6 @@ nautilus_user_level_manager_get_user_level_names (void)
return nautilus_string_list_new_from_string_list (manager->user_level_names);
}
GtkObject*
nautilus_user_level_manager_get_gconf_client (void)
{
NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
g_assert (manager->gconf_client != NULL);
gtk_object_ref (GTK_OBJECT (manager->gconf_client));
return GTK_OBJECT (manager->gconf_client);
}
char *
nautilus_user_level_manager_make_gconf_key (const char *preference_name,
int user_level)
......
......@@ -44,7 +44,6 @@ void nautilus_user_level_manager_set_user_level
guint nautilus_user_level_manager_get_user_level (void);
guint nautilus_user_level_manager_get_num_user_levels (void);
NautilusStringList *nautilus_user_level_manager_get_user_level_names (void);
GtkObject *nautilus_user_level_manager_get_gconf_client (void);
char *nautilus_user_level_manager_make_current_gconf_key (const char *preference_name);
char *nautilus_user_level_manager_make_gconf_key (const char *preference_name,
int user_level);
......
......@@ -930,7 +930,13 @@ nautilus_preferences_initialize (int argc, char **argv)
g_assert (GLOBAL.preference_table != NULL);
GLOBAL.gconf_client = GCONF_CLIENT (nautilus_user_level_manager_get_gconf_client ());
GLOBAL.gconf_client = gconf_client_new ();
/* Let gconf know about ~/.gconf/nautilus */
gconf_client_add_dir (GLOBAL.gconf_client,
PREFERENCES_GCONF_PATH,
GCONF_CLIENT_PRELOAD_RECURSIVE,
NULL);
g_assert (GLOBAL.gconf_client != NULL);
......
......@@ -328,18 +328,6 @@ nautilus_user_level_manager_get_user_level_names (void)
return nautilus_string_list_new_from_string_list (manager->user_level_names);
}
GtkObject*
nautilus_user_level_manager_get_gconf_client (void)
{
NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
g_assert (manager->gconf_client != NULL);
gtk_object_ref (GTK_OBJECT (manager->gconf_client));
return GTK_OBJECT (manager->gconf_client);
}
char *
nautilus_user_level_manager_make_gconf_key (const char *preference_name,
int user_level)
......
......@@ -44,7 +44,6 @@ void nautilus_user_level_manager_set_user_level
guint nautilus_user_level_manager_get_user_level (void);
guint nautilus_user_level_manager_get_num_user_levels (void);
NautilusStringList *nautilus_user_level_manager_get_user_level_names (void);
GtkObject *nautilus_user_level_manager_get_gconf_client (void);
char *nautilus_user_level_manager_make_current_gconf_key (const char *preference_name);
char *nautilus_user_level_manager_make_gconf_key (const char *preference_name,
int user_level);
......
......@@ -930,7 +930,13 @@ nautilus_preferences_initialize (int argc, char **argv)
g_assert (GLOBAL.preference_table != NULL);
GLOBAL.gconf_client = GCONF_CLIENT (nautilus_user_level_manager_get_gconf_client ());
GLOBAL.gconf_client = gconf_client_new ();
/* Let gconf know about ~/.gconf/nautilus */
gconf_client_add_dir (GLOBAL.gconf_client,
PREFERENCES_GCONF_PATH,
GCONF_CLIENT_PRELOAD_RECURSIVE,
NULL);
g_assert (GLOBAL.gconf_client != NULL);
......
......@@ -328,18 +328,6 @@ nautilus_user_level_manager_get_user_level_names (void)
return nautilus_string_list_new_from_string_list (manager->user_level_names);
}
GtkObject*
nautilus_user_level_manager_get_gconf_client (void)
{
NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
g_assert (manager->gconf_client != NULL);
gtk_object_ref (GTK_OBJECT (manager->gconf_client));
return GTK_OBJECT (manager->gconf_client);
}
char *
nautilus_user_level_manager_make_gconf_key (const char *preference_name,
int user_level)
......
......@@ -44,7 +44,6 @@ void nautilus_user_level_manager_set_user_level
guint nautilus_user_level_manager_get_user_level (void);
guint nautilus_user_level_manager_get_num_user_levels (void);
NautilusStringList *nautilus_user_level_manager_get_user_level_names (void);
GtkObject *nautilus_user_level_manager_get_gconf_client (void);
char *nautilus_user_level_manager_make_current_gconf_key (const char *preference_name);
char *nautilus_user_level_manager_make_gconf_key (const char *preference_name,
int user_level);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment