Update for GConf HEAD (0.9)

	* README:
	* components/mozilla/nautilus-mozilla-content-view.c:
	(nautilus_mozilla_content_view_initialize):
	* components/services/install/lib/eazel-install-metadata.c:
	(check_gconf_init), (get_conf_string), (get_conf_int),
	(get_conf_boolean):
	* components/services/install/lib/eazel-install-types.c:
	(categorydata_new):
	* components/services/nautilus-dependent-shared/Makefile.am:
	* components/services/trilobite/libtrilobite/trilobite-redirect.c:
	(check_gconf_init), (wipe_redirect_table), (add_redirect),
	(trilobite_redirect_lookup), (trilobite_get_services_address):
	* configure.in:
	* libnautilus-extensions/nautilus-global-preferences.c:
	(global_preferences_get_sidebar_panel_view_identifiers),
	(register_proxy_preferences):
	* libnautilus-extensions/nautilus-preferences-private.h:
	* libnautilus-extensions/nautilus-preferences.c:
	(preferences_hash_node_add_by_user_level_callbacks),
	(preferences_hash_node_add_callback),
	(preferences_make_make_gconf_key),
	(preferences_gconf_by_user_level_callback),
	(preferences_gconf_callback), (preferences_initialize_if_needed),
	(nautilus_preferences_set_boolean),
	(nautilus_preferences_get_boolean),
	(nautilus_preferences_set_string_list),
	(nautilus_preferences_get_string_list),
	(nautilus_preferences_set_enum), (nautilus_preferences_get_enum),
	(nautilus_preferences_set), (nautilus_preferences_get),
	(nautilus_preferences_handle_error):
	* libnautilus-extensions/nautilus-user-level-manager.c:
	(user_level_manager_new), (user_level_set_default_if_needed),
	(gconf_user_level_changed_callback),
	(nautilus_user_level_manager_set_user_level),
	(user_level_manager_get_user_level_as_string),
	(nautilus_user_level_manager_set_default_value_if_needed),
	(nautilus_user_level_manager_compare_preference_between_user_levels
	):
	Update for GConf HEAD (0.9)

17 files changed, 210 insertions, 188 deletions

diff --git a/ChangeLog b/ChangeLog
index 31f872c4b..7ffd71eb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2000-10-03  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* README:
+	* components/mozilla/nautilus-mozilla-content-view.c:
+	(nautilus_mozilla_content_view_initialize):
+	* components/services/install/lib/eazel-install-metadata.c:
+	(check_gconf_init), (get_conf_string), (get_conf_int),
+	(get_conf_boolean):
+	* components/services/install/lib/eazel-install-types.c:
+	(categorydata_new):
+	* components/services/nautilus-dependent-shared/Makefile.am:
+	* components/services/trilobite/libtrilobite/trilobite-redirect.c:
+	(check_gconf_init), (wipe_redirect_table), (add_redirect),
+	(trilobite_redirect_lookup), (trilobite_get_services_address):
+	* configure.in:
+	* libnautilus-extensions/nautilus-global-preferences.c:
+	(global_preferences_get_sidebar_panel_view_identifiers),
+	(register_proxy_preferences):
+	* libnautilus-extensions/nautilus-preferences-private.h:
+	* libnautilus-extensions/nautilus-preferences.c:
+	(preferences_hash_node_add_by_user_level_callbacks),
+	(preferences_hash_node_add_callback),
+	(preferences_make_make_gconf_key),
+	(preferences_gconf_by_user_level_callback),
+	(preferences_gconf_callback), (preferences_initialize_if_needed),
+	(nautilus_preferences_set_boolean),
+	(nautilus_preferences_get_boolean),
+	(nautilus_preferences_set_string_list),
+	(nautilus_preferences_get_string_list),
+	(nautilus_preferences_set_enum), (nautilus_preferences_get_enum),
+	(nautilus_preferences_set), (nautilus_preferences_get),
+	(nautilus_preferences_handle_error):
+	* libnautilus-extensions/nautilus-user-level-manager.c:
+	(user_level_manager_new), (user_level_set_default_if_needed),
+	(gconf_user_level_changed_callback),
+	(nautilus_user_level_manager_set_user_level),
+	(user_level_manager_get_user_level_as_string),
+	(nautilus_user_level_manager_set_default_value_if_needed),
+	(nautilus_user_level_manager_compare_preference_between_user_levels
+	):
+	Update for GConf HEAD (0.9)
+	
 2000-10-03  Andy Hertzfeld  <andy@eazel.com>
 
 	* components/music/mpg123_handler.c: (get_play_status),
diff --git a/README b/README
index 6237d3b3b..d4cf59329 100644
--- a/README
+++ b/README
@@ -110,7 +110,7 @@ The following lists the packages and the versions they should report.
     gnome-libs:        1.2.4              --enable-prefer-db1    HC1.2
     gnome-http:        1.0.6
     oaf:               0.5.0
-    gconf:             0.8
+    gconf:             HEAD
     gdk-pixbuf:        0.8.0              --enable-canvas-pixbuf
     gnome-print:       0.20.0
     control-center     1.2.0
@@ -165,7 +165,7 @@ The following lists the packages and the versions that are required.
     gnome-libs:        gnome-libs-1-0     --enable-prefer-db1    HC1.2
     gnome-http:        HEAD
     oaf:               HEAD
-    gconf:             GCONF_0_8 
+    gconf:             HEAD
     gdk-pixbuf:        HEAD               --enable-canvas-pixbuf
     gnome-print:       GNOME_PRINT_0_20
     control-center     control-center-1-0
diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c
index a3826c2e9..ef88eaf71 100644
--- a/components/mozilla/nautilus-mozilla-content-view.c
+++ b/components/mozilla/nautilus-mozilla-content-view.c
@@ -134,7 +134,7 @@ static void
 nautilus_mozilla_content_view_initialize (NautilusMozillaContentView *view)
 {
 	GConfClient *gconf_client;
-  	GConfError *error = NULL;
+  	GError *error = NULL;
   	char *argv[] = { "nautilus-mozilla-component", NULL };
   	char *proxy_string = NULL;
   	
diff --git a/components/services/install/lib/eazel-install-metadata.c b/components/services/install/lib/eazel-install-metadata.c
index 2d4f35d1b..9da017255 100644
--- a/components/services/install/lib/eazel-install-metadata.c
+++ b/components/services/install/lib/eazel-install-metadata.c
@@ -58,15 +58,15 @@ static void
 check_gconf_init (void)
 {
 #ifndef EAZEL_INSTALL_SLIM
-	GConfError *error = NULL;
+	GError *error = NULL;
 
 	if (! gconf_is_initialized ()) {
 		char *argv[] = { "trilobite", NULL };
 
 		if (! gconf_init (1, argv, &error)) {
 			g_assert (error != NULL);
-			g_warning ("gconf init error: %s", error->str);
-			gconf_error_destroy (error);
+			g_warning ("gconf init error: %s", error->message);
+			g_error_free (error);
 		}
 	}
 
@@ -85,11 +85,11 @@ get_conf_string (const char *key, const char *default_value)
 	char *value;
 
 	full_key = g_strdup_printf ("%s/%s", INSTALL_GCONF_PATH, key);
-	value = gconf_get_string (conf_engine, full_key, NULL);
+	value = gconf_engine_get_string (conf_engine, full_key, NULL);
 	if ((value == NULL) && (default_value != NULL)) {
 		value = g_strdup (default_value);
 		/* write default value to gconf */
-		gconf_set_string (conf_engine, full_key, default_value, NULL);
+		gconf_engine_set_string (conf_engine, full_key, default_value, NULL);
 	}
 	g_free (full_key);
 	return value;
@@ -107,17 +107,17 @@ get_conf_int (const char *key, int default_value)
 	int out;
 
 	full_key = g_strdup_printf ("%s/%s", INSTALL_GCONF_PATH, key);
-	value = gconf_get (conf_engine, full_key, NULL);
+	value = gconf_engine_get (conf_engine, full_key, NULL);
 	if (value && (value->type == GCONF_VALUE_INT)) {
-		out = gconf_value_int (value);
-		gconf_value_destroy (value);
+		out = gconf_value_get_int (value);
+		gconf_value_free (value);
 	} else {
 		if (value) {
-			gconf_value_destroy (value);
+			gconf_value_free (value);
 		}
 		out = default_value;
 		/* write default value to gconf */
-		gconf_set_int (conf_engine, full_key, default_value, NULL);
+		gconf_engine_set_int (conf_engine, full_key, default_value, NULL);
 	}
 
 	g_free (full_key);
@@ -137,17 +137,17 @@ get_conf_boolean (const char *key, gboolean default_value)
 
 	full_key = g_strdup_printf ("%s/%s", INSTALL_GCONF_PATH, key);
 	/* gconf API is so crappy that we can't use gconf_get_bool or anything nice */
-	value = gconf_get (conf_engine, full_key, NULL);
+	value = gconf_engine_get (conf_engine, full_key, NULL);
 	if (value && (value->type == GCONF_VALUE_BOOL)) {
-		out = gconf_value_bool (value);
-		gconf_value_destroy (value);
+		out = gconf_value_get_bool (value);
+		gconf_value_free (value);
 	} else {
 		if (value) {
-			gconf_value_destroy (value);
+			gconf_value_free (value);
 		}
 		out = default_value;
 		/* write default value to gconf */
-		gconf_set_bool (conf_engine, full_key, default_value, NULL);
+		gconf_engine_set_bool (conf_engine, full_key, default_value, NULL);
 	}
 
 	g_free (full_key);
diff --git a/components/services/install/lib/eazel-install-types.c b/components/services/install/lib/eazel-install-types.c
index b2ed17b75..5ac186440 100644
--- a/components/services/install/lib/eazel-install-types.c
+++ b/components/services/install/lib/eazel-install-types.c
@@ -65,7 +65,7 @@ protocol_as_string (URLType protocol)
 }
 
 CategoryData*
-categorydata_new ()
+categorydata_new (void)
 {
 	CategoryData *result;
 
diff --git a/components/services/nautilus-dependent-shared/Makefile.am b/components/services/nautilus-dependent-shared/Makefile.am
index 6f6970d15..f0b09d34f 100644
--- a/components/services/nautilus-dependent-shared/Makefile.am
+++ b/components/services/nautilus-dependent-shared/Makefile.am
@@ -7,8 +7,6 @@ CPPFLAGS =							\
 	-DG_LOG_DOMAIN=\"eazel-service\"			\
 	$(NULL)
 
-CFLAGS=-g -O
-
 INCLUDES = \
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\
diff --git a/components/services/trilobite/libtrilobite/trilobite-redirect.c b/components/services/trilobite/libtrilobite/trilobite-redirect.c
index 5d2ab7e55..9bd16f9de 100644
--- a/components/services/trilobite/libtrilobite/trilobite-redirect.c
+++ b/components/services/trilobite/libtrilobite/trilobite-redirect.c
@@ -59,15 +59,15 @@ trilobite_redirect_done (void)
 static void
 check_gconf_init (void)
 {
-	GConfError *error = NULL;
+	GError *error = NULL;
 
 	if (! gconf_is_initialized ()) {
 		char *argv[] = { "trilobite", NULL };
 
 		if (! gconf_init (1, argv, &error)) {
 			g_assert (error != NULL);
-			g_warning ("gconf init error: %s", error->str);
-			gconf_error_destroy (error);
+			g_warning ("gconf init error: %s", error->message);
+			g_error_free (error);
 		}
 
 	}
@@ -83,28 +83,28 @@ static void
 wipe_redirect_table (void)
 {
 	GSList *list, *iter;
-	GConfError *error = NULL;
+	GError *error = NULL;
 	GConfEntry *entry;
 	char *doomed_key;
 
 	check_gconf_init ();
-	list = gconf_all_entries (conf_engine, REDIRECT_GCONF_PATH, &error);
+	list = gconf_engine_all_entries (conf_engine, REDIRECT_GCONF_PATH, &error);
 	if (error != NULL) {
-		g_warning ("gconf wipe error: %s", error->str);
-		gconf_error_destroy (error);
+		g_warning ("gconf wipe error: %s", error->message);
+		g_error_free (error);
 		return;
 	}
 
 	for (iter = list; iter; iter = g_slist_next (iter)) {
 		entry = (GConfEntry *) (iter->data);
-		doomed_key = g_strdup_printf ("%s/%s", REDIRECT_GCONF_PATH, gconf_entry_key (entry));
-		gconf_unset (conf_engine, doomed_key, &error);
+		doomed_key = g_strdup_printf ("%s/%s", REDIRECT_GCONF_PATH, gconf_entry_get_key (entry));
+		gconf_engine_unset (conf_engine, doomed_key, &error);
 		if (error != NULL) {
-			g_warning ("trilobite redirect: gconf couldn't delete key '%s': %s", doomed_key, error->str);
-			gconf_error_destroy (error);
+			g_warning ("trilobite redirect: gconf couldn't delete key '%s': %s", doomed_key, error->message);
+			g_error_free (error);
 		}
 		g_free (doomed_key);
-		gconf_entry_destroy (entry);
+		gconf_entry_free (entry);
 	}
 	g_slist_free (list);
 }
@@ -112,7 +112,7 @@ wipe_redirect_table (void)
 static void
 add_redirect (const char *key, const char *value)
 {
-	GConfError *error = NULL;
+	GError *error = NULL;
 	char *full_key, *p;
 
 	check_gconf_init ();
@@ -123,10 +123,10 @@ add_redirect (const char *key, const char *value)
 		*p = '-';
 	}
 
-	gconf_set_string (conf_engine, full_key, value, &error);
+	gconf_engine_set_string (conf_engine, full_key, value, &error);
 	if (error != NULL) {
-		g_warning ("trilobite redirect: gconf can't add key '%s': %s", full_key, error->str);
-		gconf_error_destroy (error);
+		g_warning ("trilobite redirect: gconf can't add key '%s': %s", full_key, error->message);
+		g_error_free (error);
 	}
 	g_free (full_key);
 }
@@ -228,7 +228,7 @@ trilobite_redirect_fetch_table (const char *url)
 char *
 trilobite_redirect_lookup (const char *key)
 {
-	GConfError *error = NULL;
+	GError *error = NULL;
 	char *full_key, *p;
 	char *value;
 
@@ -240,10 +240,10 @@ trilobite_redirect_lookup (const char *key)
 		*p = '-';
 	}
 
-	value = gconf_get_string (conf_engine, full_key, &error);
+	value = gconf_engine_get_string (conf_engine, full_key, &error);
 	if (error != NULL) {
-		g_warning ("trilobite redirect: gconf can't find key '%s': %s", full_key, error->str);
-		gconf_error_destroy (error);
+		g_warning ("trilobite redirect: gconf can't find key '%s': %s", full_key, error->message);
+		g_error_free (error);
 	}
 
 	g_free (full_key);
@@ -254,14 +254,14 @@ trilobite_redirect_lookup (const char *key)
 const char *
 trilobite_get_services_address (void)
 {
-	GConfError *error = NULL;
+	GError *error = NULL;
 	char *value;
 
 	check_gconf_init ();
-	value = gconf_get_string (conf_engine, SERVICES_GCONF_PATH, &error);
+	value = gconf_engine_get_string (conf_engine, SERVICES_GCONF_PATH, &error);
 	if (error != NULL) {
 		g_warning ("trilobite: no gconf key for %s", SERVICES_GCONF_PATH);
-		gconf_error_destroy (error);
+		g_error_free (error);
 
 		value = SERVICES_DEFAULT_HOST;
 	}
diff --git a/configure.in b/configure.in
index 3c40b619d..2b05a3ddf 100644
--- a/configure.in
+++ b/configure.in
@@ -356,7 +356,7 @@ dnl Make USING_OAF be defined
 
 AC_DEFINE(USING_OAF)
 
-AM_PATH_GCONF(0.5.0,,,gconf-gtk)
+AM_PATH_GCONF(0.9.0,,,gconf-gtk)
 
 AC_PATH_PROG(XML_CONFIG,xml-config,no)
 if test x$XML_CONFIG = xno; then
diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c
index 2801f4c07..c0a73fedb 100644
--- a/libnautilus-extensions/nautilus-global-preferences.c
+++ b/libnautilus-extensions/nautilus-global-preferences.c
@@ -355,6 +355,7 @@ global_preferences_get_sidebar_panel_view_identifiers (void)
 	oaf_result = oaf_query (query, NULL, &ev);
 		
 	view_identifiers = NULL;
+
         if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL) {
 		for (i = 0; i < oaf_result->_length; i++) {
 			id = nautilus_view_identifier_new_from_sidebar_panel
@@ -696,7 +697,7 @@ register_proxy_preferences (void)
 	gboolean use_proxy;
 	char *proxy_string, *port, *proxy;
 	GConfClient *gconf_client;
-  	GConfError *error;
+  	GError *error;
 	
 	use_proxy = FALSE;
 	proxy = NULL;
diff --git a/libnautilus-extensions/nautilus-preferences-private.h b/libnautilus-extensions/nautilus-preferences-private.h
index cb8308121..1727f9469 100644
--- a/libnautilus-extensions/nautilus-preferences-private.h
+++ b/libnautilus-extensions/nautilus-preferences-private.h
@@ -31,7 +31,7 @@
 BEGIN_GNOME_DECLS
 
 /* returns FALSE if no error, and TRUE if an error was handeled */ 
-gboolean    nautilus_preferences_handle_error      (GConfError      **error);
+gboolean    nautilus_preferences_handle_error      (GError      **error);
 
 
 END_GNOME_DECLS
diff --git a/libnautilus-extensions/nautilus-preferences.c b/libnautilus-extensions/nautilus-preferences.c
index 4c97cdf92..37aa062d2 100644
--- a/libnautilus-extensions/nautilus-preferences.c
+++ b/libnautilus-extensions/nautilus-preferences.c
@@ -127,15 +127,11 @@ static char *                   preferences_make_make_gconf_key
 /* GConf callbacks */
 static void                     preferences_gconf_by_user_level_callback          (GConfClient                 *client,
 										   guint                        cnxn_id,
-										   const gchar                 *key,
-										   GConfValue                  *value,
-										   gboolean                     is_default,
+										   GConfEntry                  *value,
 										   gpointer                     user_data);
 static void                     preferences_gconf_callback                        (GConfClient                 *client,
 										   guint                        cnxn_id,
-										   const gchar                 *key,
-										   GConfValue                  *value,
-										   gboolean                     is_default,
+										   GConfEntry                  *value,
 										   gpointer                     user_data);
 
 /**
@@ -241,7 +237,7 @@ preferences_hash_node_add_by_user_level_callbacks (PreferencesHashNode		*node,
 	{
 		if (node->gconf_connections[i] == 0) {
 			char *key;
-			GConfError *error = NULL;
+			GError *error = NULL;
 
 			g_assert (node->name != NULL);
 			g_assert (node->gconf_connections[i] == 0);
@@ -298,11 +294,11 @@ preferences_hash_node_add_callback (PreferencesHashNode		*node,
 	 * per registered callback.
 	 */
 	if (node->gconf_connections[0] == 0) {
-		GConfError *error = NULL;
+		GError *error = NULL;
 
 		g_assert (node->name != NULL);
 		g_assert (node->gconf_connections[0] == 0);
-		
+
 		node->gconf_connections[0] = gconf_client_notify_add (GLOBAL.gconf_client,
 								      node->name,
 								      preferences_gconf_callback,
@@ -522,18 +518,9 @@ static char *
 preferences_make_make_gconf_key (const char *preference_name)
 {
 	if (nautilus_str_has_prefix (preference_name, "/")) {
-		//g_print ("key for %s is %s\n", preference_name, preference_name);
 		return g_strdup (preference_name);
 	}
 
-#if 0
-	{
-		char *foo = nautilus_user_level_manager_make_current_gconf_key (preference_name);
-		g_print ("key for %s is %s\n", preference_name, foo);
-		g_free (foo);
-	}
-#endif
-
 	return nautilus_user_level_manager_make_current_gconf_key (preference_name);
 }
 
@@ -575,17 +562,20 @@ preferences_hash_node_lookup (const char *name)
 static void
 preferences_gconf_by_user_level_callback (GConfClient	*client, 
 					  guint		connection_id, 
-					  const gchar	*key, 
-					  GConfValue	*value, 
-					  gboolean	is_default, 
+					  GConfEntry	*entry, 
 					  gpointer	user_data)
 {
 	PreferencesHashNode	*node;
 	const char		*expected_name;
 	char			*expected_key;
-	GConfError		*error = NULL;
+	GError			*error = NULL;
+	const char		*key;
 
 	g_return_if_fail (user_data != NULL);
+	g_return_if_fail (entry != NULL);
+	g_return_if_fail (entry->key != NULL);
+
+	key = entry->key;
 
 	node = (PreferencesHashNode *) user_data;
 
@@ -615,7 +605,7 @@ preferences_gconf_by_user_level_callback (GConfClient	*client,
 	if (strcmp (key, expected_key) != 0) {
 
 		/* The prefix should be the same */
-		if (strncmp (key, expected_key, strlen (expected_key)) != 0) {
+		if (strncmp (entry->key, expected_key, strlen (expected_key)) != 0) {
 
 			/* FIXME bugzilla.eazel.com 1272: This is triggering the first time the beast runs
 			 * without an existing ~/.gconf directory.
@@ -652,20 +642,23 @@ preferences_gconf_by_user_level_callback (GConfClient	*client,
 static void
 preferences_gconf_callback (GConfClient	*client, 
 			    guint	connection_id, 
-			    const gchar	*key, 
-			    GConfValue	*value, 
-			    gboolean	is_default, 
+			    GConfEntry	*entry, 
 			    gpointer	user_data)
 {
 	PreferencesHashNode	*node;
-	GConfError		*error = NULL;
+	GError			*error = NULL;
+	const char	        *key;
 
 	g_return_if_fail (user_data != NULL);
+	g_return_if_fail (entry != NULL);
+	g_return_if_fail (entry->key != NULL);
 	
 	node = (PreferencesHashNode *) user_data;
 	g_assert (node != NULL);
+
+	key = entry->key;
 	
-	g_assert (nautilus_str_is_equal ( node->name, key));
+	g_assert (nautilus_str_is_equal (node->name, key));
 
 	gconf_client_suggest_sync (GLOBAL.gconf_client, &error);
 	nautilus_preferences_handle_error (&error);
@@ -696,7 +689,7 @@ user_level_changed_callback (GtkObject	*user_level_manager,
 static gboolean
 preferences_initialize_if_needed (void)
 {
-	GConfError	  *error = NULL;
+	GError	  *error = NULL;
 
 	if (GLOBAL.preference_table != NULL && GLOBAL.gconf_client != NULL) {
 		return TRUE;
@@ -728,7 +721,7 @@ preferences_initialize_if_needed (void)
 	/* Let gconf know about ~/.gconf/nautilus */
 	gconf_client_add_dir (GLOBAL.gconf_client,
 			      PREFERENCES_GCONF_PATH,
-			      GCONF_CLIENT_PRELOAD_RECURSIVE,
+			      GCONF_CLIENT_PRELOAD_NONE,
 			      &error);
 	nautilus_preferences_handle_error (&error);
 
@@ -811,7 +804,7 @@ void
 nautilus_preferences_set_boolean (const char	*name,
 				  gboolean	boolean_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	char		*key;
 	gboolean	 old_value;
 
@@ -844,7 +837,7 @@ gboolean
 nautilus_preferences_get_boolean (const char	*name,
 				  gboolean	default_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	gboolean         result;
 	char		*key;
 
@@ -870,7 +863,7 @@ void
 nautilus_preferences_set_string_list (const char	*name,
 				      GSList            *string_list_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	char		*key;
 
 	g_return_if_fail (name != NULL);
@@ -898,7 +891,7 @@ nautilus_preferences_set_string_list (const char	*name,
 GSList *
 nautilus_preferences_get_string_list (const char	*name)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	GSList          *result;
 	char            *key;
 
@@ -923,7 +916,7 @@ void
 nautilus_preferences_set_enum (const char    *name,
 			       int           enum_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	int		 old_value;
 	char		*key;
 
@@ -956,7 +949,7 @@ int
 nautilus_preferences_get_enum (const char	*name,
 			       int		default_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	int              result;
 	char		*key;
 
@@ -981,7 +974,7 @@ void
 nautilus_preferences_set (const char *name, 
 			  const char *value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	char		*key;
 
 	g_return_if_fail (name != NULL);
@@ -1026,7 +1019,7 @@ char *
 nautilus_preferences_get (const char	*name,
 			  const char	*default_value)
 {
-	GConfError	*error = NULL;
+	GError	*error = NULL;
 	gchar		*value = NULL;
 	char		*key;
 
@@ -1083,14 +1076,14 @@ preferences_shutdown (void)
 }
 
 gboolean
-nautilus_preferences_handle_error (GConfError **error)
+nautilus_preferences_handle_error (GError **error)
 {
 	static gboolean shown_dialog = FALSE;
 
 	g_return_val_if_fail (error != NULL, FALSE);
 
 	if (*error != NULL) {
-		g_warning (_("GConf error:\n  %s"), (*error)->str);
+		g_warning (_("GConf error:\n  %s"), (*error)->message);
 		if ( ! shown_dialog) {
 			char *message;
 			GtkWidget *dialog;
@@ -1100,11 +1093,11 @@ nautilus_preferences_handle_error (GConfError **error)
 			message = g_strdup_printf (_("GConf error:\n  %s\n"
 						     "All further errors shown "
 						     "only on terminal"),
-						   (*error)->str);
+						   (*error)->message);
 
 			dialog = gnome_error_dialog (message);
 		}
-		gconf_error_destroy(*error);
+		g_error_free (*error);
 		*error = NULL;
 
 		return TRUE;
diff --git a/libnautilus-extensions/nautilus-user-level-manager.c b/libnautilus-extensions/nautilus-user-level-manager.c
index d85cb9046..4050b1da1 100644
--- a/libnautilus-extensions/nautilus-user-level-manager.c
+++ b/libnautilus-extensions/nautilus-user-level-manager.c
@@ -109,9 +109,7 @@ static void                      user_level_set_default_if_needed             (N
 /* Gconf callbacks */
 static void                      gconf_user_level_changed_callback            (GConfClient                   *client,
 									       guint                          cnxn_id,
-									       const gchar                   *key,
-									       GConfValue                    *value,
-									       gboolean                       is_default,
+									       GConfEntry                    *entry,
 									       gpointer                       user_data);
 
 
@@ -121,7 +119,7 @@ NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUserLevelManager, nautilus_user_level
 static NautilusUserLevelManager *
 user_level_manager_new (void)
 {
-	GConfError	  	 *error = NULL;
+	GError			*error = NULL;
         NautilusUserLevelManager *manager;
         guint			 i;
 
@@ -146,10 +144,11 @@ user_level_manager_new (void)
 	/* Let gconf know about ~/.gconf/apps/nautilus */
 	gconf_client_add_dir (manager->gconf_client,
 			      USER_LEVEL_PATH,
-			      GCONF_CLIENT_PRELOAD_RECURSIVE,
+			      GCONF_CLIENT_PRELOAD_NONE,
 			      &error);
+
 	nautilus_preferences_handle_error (&error);
-	
+
 	manager->num_user_levels = DEFAULT_NUM_USER_LEVELS;
 	manager->user_level_names_for_storage = nautilus_string_list_new (TRUE);
 	manager->user_level_names_for_display = nautilus_string_list_new (TRUE);
@@ -246,7 +245,7 @@ user_level_manager_ensure_global_manager (void)
 static void
 user_level_set_default_if_needed (NautilusUserLevelManager *manager)
 {
-	GConfError *error = NULL;
+	GError *error = NULL;
 	GConfValue *value;
 
 	g_assert (manager != NULL);
@@ -255,7 +254,7 @@ user_level_set_default_if_needed (NautilusUserLevelManager *manager)
 	value = gconf_client_get_without_default (manager->gconf_client, USER_LEVEL_KEY, &error);
 	if (nautilus_preferences_handle_error (&error)) {
 		if (value != NULL) {
-			gconf_value_destroy (value);
+			gconf_value_free (value);
 			value = NULL;
 		}
 	}
@@ -274,15 +273,13 @@ user_level_set_default_if_needed (NautilusUserLevelManager *manager)
 
 	g_assert (value != NULL);
 
-	gconf_value_destroy (value);
+	gconf_value_free (value);
 }
 
 static void
 gconf_user_level_changed_callback (GConfClient	*client, 
 				   guint	connection_id, 
-				   const gchar	*key, 
-				   GConfValue	*value, 
-				   gboolean	is_default, 
+				   GConfEntry	*entry, 
 				   gpointer	user_data)
 {
 	NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
@@ -305,7 +302,7 @@ nautilus_user_level_manager_get (void)
 void
 nautilus_user_level_manager_set_user_level (guint user_level)
 {
-	GConfError		 *error = NULL;
+	GError		 *error = NULL;
 	NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
 	char			 *user_level_string;
 	guint			 old_user_level;
@@ -409,7 +406,7 @@ nautilus_user_level_manager_make_current_gconf_key (const char *preference_name)
 static char *
 user_level_manager_get_user_level_as_string (void)
 {
-	GConfError		 *error = NULL;
+	GError		 *error = NULL;
 	NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
 	char			 *user_level_string = NULL;
 
@@ -450,7 +447,7 @@ nautilus_user_level_manager_set_default_value_if_needed (const char		*preference
 							 gconstpointer		default_value)
 {
 	NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	GConfValue	*value = NULL;
 	char		*key;
 
@@ -463,7 +460,7 @@ nautilus_user_level_manager_set_default_value_if_needed (const char		*preference
 	value = gconf_client_get_without_default (manager->gconf_client, key, &error);
 	if (nautilus_preferences_handle_error (&error)) {
 		if (value != NULL) {
-			gconf_value_destroy (value);
+			gconf_value_free (value);
 			value = NULL;
 		}
 	}
@@ -496,7 +493,7 @@ nautilus_user_level_manager_set_default_value_if_needed (const char		*preference
 	}
 	
 	if (value) {
-		gconf_value_destroy (value);
+		gconf_value_free (value);
 	}
 
 	g_free (key);
@@ -513,7 +510,7 @@ nautilus_user_level_manager_compare_preference_between_user_levels (const char *
 	char		*key_b;
 	GConfValue	*value_a;
 	GConfValue	*value_b;
-	GConfError	*error = NULL;
+	GError	*error = NULL;
 
 	g_return_val_if_fail (preference_name != NULL, FALSE);
 
@@ -526,14 +523,14 @@ nautilus_user_level_manager_compare_preference_between_user_levels (const char *
 	value_a = gconf_client_get (manager->gconf_client, key_a, &error);
 	if (nautilus_preferences_handle_error (&error)) {
 		if (value_a != NULL) {
-			gconf_value_destroy (value_a);
+			gconf_value_free (value_a);
 			value_a = NULL;
 		}
 	}
 	value_b = gconf_client_get (manager->gconf_client, key_b, &error);
 	if (nautilus_preferences_handle_error (&error)) {
 		if (value_b != NULL) {
-			gconf_value_destroy (value_b);
+			gconf_value_free (value_b);
 			value_b = NULL;
 		}
 	}
@@ -548,17 +545,17 @@ nautilus_user_level_manager_compare_preference_between_user_levels (const char *
 		switch (value_a->type)
 		{
 		case GCONF_VALUE_STRING:
-			result = (gconf_value_string (value_a)
-				  && gconf_value_string (value_b)
-				  && (strcmp (gconf_value_string (value_a), gconf_value_string (value_b)) == 0));
+			result = (gconf_value_get_string (value_a)
+				  && gconf_value_get_string (value_b)
+				  && (strcmp (gconf_value_get_string (value_a), gconf_value_get_string (value_b)) == 0));
 			break;
 			
 		case GCONF_VALUE_INT:
-			result = (gconf_value_int (value_a) == gconf_value_int (value_b));
+			result = (gconf_value_get_int (value_a) == gconf_value_get_int (value_b));
 			break;
 			
 		case GCONF_VALUE_BOOL:
-			result = (gconf_value_bool (value_a) == gconf_value_bool (value_b));
+			result = (gconf_value_get_bool (value_a) == gconf_value_get_bool (value_b));
 			break;
 
 		default:
@@ -571,11 +568,11 @@ nautilus_user_level_manager_compare_preference_between_user_levels (const char *
 	}
 
 	if (value_a) {
-		gconf_value_destroy (value_a);
+		gconf_value_free (value_a);
 	}
 
 	if (value_b) {
-		gconf_value_destroy (value_b);
+		gconf_value_free (value_b);
 	}
 
 	return result;
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 2801f4c07..c0a73fedb 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -355,6 +355,7 @@ global_preferences_get_sidebar_panel_view_identifiers (void)
 	oaf_result = oaf_query (query, NULL, &ev);
 		
 	view_identifiers = NULL;
+
         if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL) {
 		for (i = 0; i < oaf_result->_length; i++) {
 			id = nautilus_view_identifier_new_from_sidebar_panel
@@ -696,7 +697,7 @@ register_proxy_preferences (void)
 	gboolean use_proxy;
 	char *proxy_string, *port, *proxy;
 	GConfClient *gconf_client;
-  	GConfError *error;
+  	GError *error;
 	
 	use_proxy = FALSE;
 	proxy = NULL;
diff --git a/libnautilus-private/nautilus-preferences-private.h b/libnautilus-private/nautilus-preferences-private.h
index cb8308121..1727f9469 100644
--- a/libnautilus-private/nautilus-preferences-private.h
+++ b/libnautilus-private/nautilus-preferences-private.h
@@ -31,7 +31,7 @@
 BEGIN_GNOME_DECLS
 
 /* returns FALSE if no error, and TRUE if an error was handeled */ 
-gboolean    nautilus_preferences_handle_error      (GConfError      **error);
+gboolean    nautilus_preferences_handle_error      (GError      **error);
 
 
 END_GNOME_DECLS
diff --git a/libnautilus-private/nautilus-preferences.c b/libnautilus-private/nautilus-preferences.c
index 4c97cdf92..37aa062d2 100644
--- a/libnautilus-private/nautilus-preferences.c
+++ b/libnautilus-private/nautilus-preferences.c
@@ -127,15 +127,11 @@ static char *                   preferences_make_make_gconf_key
 /* GConf callbacks */
 static void                     preferences_gconf_by_user_level_callback          (GConfClient                 *client,
 										   guint                        cnxn_id,
-										   const gchar                 *key,
-										   GConfValue                  *value,
-										   gboolean                     is_default,
+										   GConfEntry                  *value,
 										   gpointer                     user_data);
 static void                     preferences_gconf_callback                        (GConfClient                 *client,
 										   guint                        cnxn_id,
-										   const gchar                 *key,
-										   GConfValue                  *value,
-										   gboolean                     is_default,
+										   GConfEntry                  *value,
 										   gpointer                     user_data);
 
 /**
@@ -241,7 +237,7 @@ preferences_hash_node_add_by_user_level_callbacks (PreferencesHashNode		*node,
 	{
 		if (node->gconf_connections[i] == 0) {
 			char *key;
-			GConfError *error = NULL;
+			GError *error = NULL;
 
 			g_assert (node->name != NULL);
 			g_assert (node->gconf_connections[i] == 0);
@@ -298,11 +294,11 @@ preferences_hash_node_add_callback (PreferencesHashNode		*node,
 	 * per registered callback.
 	 */
 	if (node->gconf_connections[0] == 0) {
-		GConfError *error = NULL;
+		GError *error = NULL;
 
 		g_assert (node->name != NULL);
 		g_assert (node->gconf_connections[0] == 0);
-		
+
 		node->gconf_connections[0] = gconf_client_notify_add (GLOBAL.gconf_client,
 								      node->name,
 								      preferences_gconf_callback,
@@ -522,18 +518,9 @@ static char *
 preferences_make_make_gconf_key (const char *preference_name)
 {
 	if (nautilus_str_has_prefix (preference_name, "/")) {
-		//g_print ("key for %s is %s\n", preference_name, preference_name);
 		return g_strdup (preference_name);
 	}
 
-#if 0
-	{
-		char *foo = nautilus_user_level_manager_make_current_gconf_key (preference_name);
-		g_print ("key for %s is %s\n", preference_name, foo);
-		g_free (foo);
-	}
-#endif
-
 	return nautilus_user_level_manager_make_current_gconf_key (preference_name);
 }
 
@@ -575,17 +562,20 @@ preferences_hash_node_lookup (const char *name)
 static void
 preferences_gconf_by_user_level_callback (GConfClient	*client, 
 					  guint		connection_id, 
-					  const gchar	*key, 
-					  GConfValue	*value, 
-					  gboolean	is_default, 
+					  GConfEntry	*entry, 
 					  gpointer	user_data)
 {
 	PreferencesHashNode	*node;
 	const char		*expected_name;
 	char			*expected_key;
-	GConfError		*error = NULL;
+	GError			*error = NULL;
+	const char		*key;
 
 	g_return_if_fail (user_data != NULL);
+	g_return_if_fail (entry != NULL);
+	g_return_if_fail (entry->key != NULL);
+
+	key = entry->key;
 
 	node = (PreferencesHashNode *) user_data;
 
@@ -615,7 +605,7 @@ preferences_gconf_by_user_level_callback (GConfClient	*client,
 	if (strcmp (key, expected_key) != 0) {
 
 		/* The prefix should be the same */
-		if (strncmp (key, expected_key, strlen (expected_key)) != 0) {
+		if (strncmp (entry->key, expected_key, strlen (expected_key)) != 0) {
 
 			/* FIXME bugzilla.eazel.com 1272: This is triggering the first time the beast runs
 			 * without an existing ~/.gconf directory.
@@ -652,20 +642,23 @@ preferences_gconf_by_user_level_callback (GConfClient	*client,
 static void
 preferences_gconf_callback (GConfClient	*client, 
 			    guint	connection_id, 
-			    const gchar	*key, 
-			    GConfValue	*value, 
-			    gboolean	is_default, 
+			    GConfEntry	*entry, 
 			    gpointer	user_data)
 {
 	PreferencesHashNode	*node;
-	GConfError		*error = NULL;
+	GError			*error = NULL;
+	const char	        *key;
 
 	g_return_if_fail (user_data != NULL);
+	g_return_if_fail (entry != NULL);
+	g_return_if_fail (entry->key != NULL);
 	
 	node = (PreferencesHashNode *) user_data;
 	g_assert (node != NULL);
+
+	key = entry->key;
 	
-	g_assert (nautilus_str_is_equal ( node->name, key));
+	g_assert (nautilus_str_is_equal (node->name, key));
 
 	gconf_client_suggest_sync (GLOBAL.gconf_client, &error);
 	nautilus_preferences_handle_error (&error);
@@ -696,7 +689,7 @@ user_level_changed_callback (GtkObject	*user_level_manager,
 static gboolean
 preferences_initialize_if_needed (void)
 {
-	GConfError	  *error = NULL;
+	GError	  *error = NULL;
 
 	if (GLOBAL.preference_table != NULL && GLOBAL.gconf_client != NULL) {
 		return TRUE;
@@ -728,7 +721,7 @@ preferences_initialize_if_needed (void)
 	/* Let gconf know about ~/.gconf/nautilus */
 	gconf_client_add_dir (GLOBAL.gconf_client,
 			      PREFERENCES_GCONF_PATH,
-			      GCONF_CLIENT_PRELOAD_RECURSIVE,
+			      GCONF_CLIENT_PRELOAD_NONE,
 			      &error);
 	nautilus_preferences_handle_error (&error);
 
@@ -811,7 +804,7 @@ void
 nautilus_preferences_set_boolean (const char	*name,
 				  gboolean	boolean_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	char		*key;
 	gboolean	 old_value;
 
@@ -844,7 +837,7 @@ gboolean
 nautilus_preferences_get_boolean (const char	*name,
 				  gboolean	default_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	gboolean         result;
 	char		*key;
 
@@ -870,7 +863,7 @@ void
 nautilus_preferences_set_string_list (const char	*name,
 				      GSList            *string_list_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	char		*key;
 
 	g_return_if_fail (name != NULL);
@@ -898,7 +891,7 @@ nautilus_preferences_set_string_list (const char	*name,
 GSList *
 nautilus_preferences_get_string_list (const char	*name)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	GSList          *result;
 	char            *key;
 
@@ -923,7 +916,7 @@ void
 nautilus_preferences_set_enum (const char    *name,
 			       int           enum_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	int		 old_value;
 	char		*key;
 
@@ -956,7 +949,7 @@ int
 nautilus_preferences_get_enum (const char	*name,
 			       int		default_value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	int              result;
 	char		*key;
 
@@ -981,7 +974,7 @@ void
 nautilus_preferences_set (const char *name, 
 			  const char *value)
 {
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	char		*key;
 
 	g_return_if_fail (name != NULL);
@@ -1026,7 +1019,7 @@ char *
 nautilus_preferences_get (const char	*name,
 			  const char	*default_value)
 {
-	GConfError	*error = NULL;
+	GError	*error = NULL;
 	gchar		*value = NULL;
 	char		*key;
 
@@ -1083,14 +1076,14 @@ preferences_shutdown (void)
 }
 
 gboolean
-nautilus_preferences_handle_error (GConfError **error)
+nautilus_preferences_handle_error (GError **error)
 {
 	static gboolean shown_dialog = FALSE;
 
 	g_return_val_if_fail (error != NULL, FALSE);
 
 	if (*error != NULL) {
-		g_warning (_("GConf error:\n  %s"), (*error)->str);
+		g_warning (_("GConf error:\n  %s"), (*error)->message);
 		if ( ! shown_dialog) {
 			char *message;
 			GtkWidget *dialog;
@@ -1100,11 +1093,11 @@ nautilus_preferences_handle_error (GConfError **error)
 			message = g_strdup_printf (_("GConf error:\n  %s\n"
 						     "All further errors shown "
 						     "only on terminal"),
-						   (*error)->str);
+						   (*error)->message);
 
 			dialog = gnome_error_dialog (message);
 		}
-		gconf_error_destroy(*error);
+		g_error_free (*error);
 		*error = NULL;
 
 		return TRUE;
diff --git a/libnautilus-private/nautilus-user-level-manager.c b/libnautilus-private/nautilus-user-level-manager.c
index d85cb9046..4050b1da1 100644
--- a/libnautilus-private/nautilus-user-level-manager.c
+++ b/libnautilus-private/nautilus-user-level-manager.c
@@ -109,9 +109,7 @@ static void                      user_level_set_default_if_needed             (N
 /* Gconf callbacks */
 static void                      gconf_user_level_changed_callback            (GConfClient                   *client,
 									       guint                          cnxn_id,
-									       const gchar                   *key,
-									       GConfValue                    *value,
-									       gboolean                       is_default,
+									       GConfEntry                    *entry,
 									       gpointer                       user_data);
 
 
@@ -121,7 +119,7 @@ NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUserLevelManager, nautilus_user_level
 static NautilusUserLevelManager *
 user_level_manager_new (void)
 {
-	GConfError	  	 *error = NULL;
+	GError			*error = NULL;
         NautilusUserLevelManager *manager;
         guint			 i;
 
@@ -146,10 +144,11 @@ user_level_manager_new (void)
 	/* Let gconf know about ~/.gconf/apps/nautilus */
 	gconf_client_add_dir (manager->gconf_client,
 			      USER_LEVEL_PATH,
-			      GCONF_CLIENT_PRELOAD_RECURSIVE,
+			      GCONF_CLIENT_PRELOAD_NONE,
 			      &error);
+
 	nautilus_preferences_handle_error (&error);
-	
+
 	manager->num_user_levels = DEFAULT_NUM_USER_LEVELS;
 	manager->user_level_names_for_storage = nautilus_string_list_new (TRUE);
 	manager->user_level_names_for_display = nautilus_string_list_new (TRUE);
@@ -246,7 +245,7 @@ user_level_manager_ensure_global_manager (void)
 static void
 user_level_set_default_if_needed (NautilusUserLevelManager *manager)
 {
-	GConfError *error = NULL;
+	GError *error = NULL;
 	GConfValue *value;
 
 	g_assert (manager != NULL);
@@ -255,7 +254,7 @@ user_level_set_default_if_needed (NautilusUserLevelManager *manager)
 	value = gconf_client_get_without_default (manager->gconf_client, USER_LEVEL_KEY, &error);
 	if (nautilus_preferences_handle_error (&error)) {
 		if (value != NULL) {
-			gconf_value_destroy (value);
+			gconf_value_free (value);
 			value = NULL;
 		}
 	}
@@ -274,15 +273,13 @@ user_level_set_default_if_needed (NautilusUserLevelManager *manager)
 
 	g_assert (value != NULL);
 
-	gconf_value_destroy (value);
+	gconf_value_free (value);
 }
 
 static void
 gconf_user_level_changed_callback (GConfClient	*client, 
 				   guint	connection_id, 
-				   const gchar	*key, 
-				   GConfValue	*value, 
-				   gboolean	is_default, 
+				   GConfEntry	*entry, 
 				   gpointer	user_data)
 {
 	NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
@@ -305,7 +302,7 @@ nautilus_user_level_manager_get (void)
 void
 nautilus_user_level_manager_set_user_level (guint user_level)
 {
-	GConfError		 *error = NULL;
+	GError		 *error = NULL;
 	NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
 	char			 *user_level_string;
 	guint			 old_user_level;
@@ -409,7 +406,7 @@ nautilus_user_level_manager_make_current_gconf_key (const char *preference_name)
 static char *
 user_level_manager_get_user_level_as_string (void)
 {
-	GConfError		 *error = NULL;
+	GError		 *error = NULL;
 	NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
 	char			 *user_level_string = NULL;
 
@@ -450,7 +447,7 @@ nautilus_user_level_manager_set_default_value_if_needed (const char		*preference
 							 gconstpointer		default_value)
 {
 	NautilusUserLevelManager *manager = nautilus_user_level_manager_get ();
-	GConfError      *error = NULL;
+	GError      *error = NULL;
 	GConfValue	*value = NULL;
 	char		*key;
 
@@ -463,7 +460,7 @@ nautilus_user_level_manager_set_default_value_if_needed (const char		*preference
 	value = gconf_client_get_without_default (manager->gconf_client, key, &error);
 	if (nautilus_preferences_handle_error (&error)) {
 		if (value != NULL) {
-			gconf_value_destroy (value);
+			gconf_value_free (value);
 			value = NULL;
 		}
 	}
@@ -496,7 +493,7 @@ nautilus_user_level_manager_set_default_value_if_needed (const char		*preference
 	}
 	
 	if (value) {
-		gconf_value_destroy (value);
+		gconf_value_free (value);
 	}
 
 	g_free (key);
@@ -513,7 +510,7 @@ nautilus_user_level_manager_compare_preference_between_user_levels (const char *
 	char		*key_b;
 	GConfValue	*value_a;
 	GConfValue	*value_b;
-	GConfError	*error = NULL;
+	GError	*error = NULL;
 
 	g_return_val_if_fail (preference_name != NULL, FALSE);
 
@@ -526,14 +523,14 @@ nautilus_user_level_manager_compare_preference_between_user_levels (const char *
 	value_a = gconf_client_get (manager->gconf_client, key_a, &error);
 	if (nautilus_preferences_handle_error (&error)) {
 		if (value_a != NULL) {
-			gconf_value_destroy (value_a);
+			gconf_value_free (value_a);
 			value_a = NULL;
 		}
 	}
 	value_b = gconf_client_get (manager->gconf_client, key_b, &error);
 	if (nautilus_preferences_handle_error (&error)) {
 		if (value_b != NULL) {
-			gconf_value_destroy (value_b);
+			gconf_value_free (value_b);
 			value_b = NULL;
 		}
 	}
@@ -548,17 +545,17 @@ nautilus_user_level_manager_compare_preference_between_user_levels (const char *
 		switch (value_a->type)
 		{
 		case GCONF_VALUE_STRING:
-			result = (gconf_value_string (value_a)
-				  && gconf_value_string (value_b)
-				  && (strcmp (gconf_value_string (value_a), gconf_value_string (value_b)) == 0));
+			result = (gconf_value_get_string (value_a)
+				  && gconf_value_get_string (value_b)
+				  && (strcmp (gconf_value_get_string (value_a), gconf_value_get_string (value_b)) == 0));
 			break;
 			
 		case GCONF_VALUE_INT:
-			result = (gconf_value_int (value_a) == gconf_value_int (value_b));
+			result = (gconf_value_get_int (value_a) == gconf_value_get_int (value_b));
 			break;
 			
 		case GCONF_VALUE_BOOL:
-			result = (gconf_value_bool (value_a) == gconf_value_bool (value_b));
+			result = (gconf_value_get_bool (value_a) == gconf_value_get_bool (value_b));
 			break;
 
 		default:
@@ -571,11 +568,11 @@ nautilus_user_level_manager_compare_preference_between_user_levels (const char *
 	}
 
 	if (value_a) {
-		gconf_value_destroy (value_a);
+		gconf_value_free (value_a);
 	}
 
 	if (value_b) {
-		gconf_value_destroy (value_b);
+		gconf_value_free (value_b);
 	}
 
 	return result;
diff --git a/nautilus.spec.in b/nautilus.spec.in
index 83980f621..56eaa5640 100644
--- a/nautilus.spec.in
+++ b/nautilus.spec.in
@@ -21,7 +21,7 @@ Requires:	gtk+ >= 1.2.8
 Requires:	imlib >= 1.9.8
 Requires:	libxml >= 1.8.6
 Requires:	gnome-libs >= 1.2.1
-Requires:	GConf >= 0.5
+Requires:	GConf >= 0.9
 Requires:	ORBit >= 0.5.1
 Requires:	oaf >= 0.3.0
 Requires:	gnome-vfs >= 0.1