[gnome-utils/gsettings-tutorial: 16/22] [gsettings-tutorial] All /apps/baobab keys are now handled via GSettings

[Vincent Untz <vuntz src gnome org>]

commit 25a8d5be497be546d379c9a41f221715f7f4fa7c
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Apr 16 18:43:12 2010 -0400

    [gsettings-tutorial] All /apps/baobab keys are now handled via GSettings
    
    This means we can safely remove the gconf_client_add_dir() call for this
    gconf directory.

 baobab/src/baobab-prefs.c |    4 ++--
 baobab/src/baobab.c       |    8 +++-----
 baobab/src/baobab.h       |    3 +--
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/baobab/src/baobab-prefs.c b/baobab/src/baobab-prefs.c
index d063fa6..0a6c701 100644
--- a/baobab/src/baobab-prefs.c
+++ b/baobab/src/baobab-prefs.c
@@ -295,7 +295,7 @@ update_skip_scan_uri (GSettings *settings_properties)
 {
 	gchar **skip_uris;
 
-	skip_uris = g_settings_get_strv (settings_properties, "skip_scan_uri_list",
+	skip_uris = g_settings_get_strv (settings_properties, PROPS_SCAN_KEY,
 					 NULL);
 	gtk_tree_model_foreach (GTK_TREE_MODEL (model_props),
 				set_model_checks, skip_uris);
@@ -311,7 +311,7 @@ save_skip_can_uri (GSettings *settings_properties)
 	gtk_tree_model_foreach (GTK_TREE_MODEL (model_props),
 				set_skip_uri, array);
 
-	g_settings_set_strv (settings_properties, "skip_scan_uri_list",
+	g_settings_set_strv (settings_properties, PROPS_SCAN_KEY,
 			     (const gchar * const *) array->pdata, array->len);
 
 	g_ptr_array_free (array, TRUE);
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
index bdc5bb9..e948f5b 100644
--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -677,7 +677,7 @@ store_excluded_locations (void)
 		g_ptr_array_add (array, g_file_get_uri (l->data));
 	}
 
-	g_settings_set_strv (baobab.settings_properties, "skip_scan_uri_list",
+	g_settings_set_strv (baobab.settings_properties, PROPS_SCAN_KEY,
 			     (const gchar * const *) array->pdata, array->len);
 
 	g_ptr_array_free (array, TRUE);
@@ -807,8 +807,6 @@ baobab_init (void)
 
 	/* GConf */
 	baobab.gconf_client = gconf_client_get_default ();
-	gconf_client_add_dir (baobab.gconf_client, BAOBAB_KEY_DIR,
-			      GCONF_CLIENT_PRELOAD_NONE, NULL);
 	gconf_client_notify_add (baobab.gconf_client, SYSTEM_TOOLBAR_STYLE, baobab_toolbar_style,
 				 NULL, NULL, NULL);				 
 
@@ -844,11 +842,11 @@ baobab_init (void)
 	g_signal_connect (baobab.settings_properties, "changed::" PROPS_ENABLE_HOME_MONITOR,
 			  (GCallback) baobab_settings_home_monitor_changed, NULL);
 
-	skip_uris = g_settings_get_strv (baobab.settings_properties, "skip_scan_uri_list",
+	skip_uris = g_settings_get_strv (baobab.settings_properties, PROPS_SCAN_KEY,
 					 &skip_uris_size);
 	baobab_set_excluded_locations (skip_uris, skip_uris_size);
 	g_strfreev (skip_uris);
-	g_signal_connect (baobab.settings_properties, "changed::" "skip_scan_uri_list",
+	g_signal_connect (baobab.settings_properties, "changed::" PROPS_SCAN_KEY,
 			  (GCallback) baobab_settings_skip_scan_uri_changed, NULL);
 
 	monitor_home_dir ();
diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h
index 6aa241b..f4c6f28 100644
--- a/baobab/src/baobab.h
+++ b/baobab/src/baobab.h
@@ -39,11 +39,10 @@ struct BaobabSearchOpt;
 #define BAOBAB_UI_FILE PKGDATADIR "/baobab-main-window.ui"
 #define BAOBAB_DIALOG_SCAN_UI_FILE PKGDATADIR "/baobab-dialog-scan-props.ui"
 
-#define BAOBAB_KEY_DIR "/apps/baobab"
 #define BAOBAB_TOOLBAR_VISIBLE_KEY	"toolbar_visible"
 #define BAOBAB_STATUSBAR_VISIBLE_KEY	"statusbar_visible"
 #define BAOBAB_SUBFLSTIPS_VISIBLE_KEY   "baobab_subfoldertips_visible"
-#define PROPS_SCAN_KEY			BAOBAB_KEY_DIR "/properties/skip_scan_uri_list"
+#define PROPS_SCAN_KEY			"skip_scan_uri_list"
 #define PROPS_ENABLE_HOME_MONITOR	"enable_home_monitor"
 #define SYSTEM_TOOLBAR_STYLE		"/desktop/gnome/interface/toolbar_style"