[gnome-utils] More consistent defines for the prefs keys

[Paolo Borelli <pborelli src gnome org>]

commit 148c2363536de23de8a154fdd907cf624d11df61
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Jul 24 16:45:08 2010 +0200

    More consistent defines for the prefs keys

 baobab/src/baobab-prefs.c |    4 ++--
 baobab/src/baobab.c       |   18 +++++++++---------
 baobab/src/baobab.h       |   13 ++++++-------
 3 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/baobab/src/baobab-prefs.c b/baobab/src/baobab-prefs.c
index f862486..1ceec28 100644
--- a/baobab/src/baobab-prefs.c
+++ b/baobab/src/baobab-prefs.c
@@ -93,7 +93,7 @@ save_gconf (GtkTreeModel *model)
 	l = get_excluded_locations (model);
 
 	gconf_client_set_list (baobab.gconf_client,
-			       PROPS_SCAN_KEY, GCONF_VALUE_STRING,
+			       BAOBAB_EXCLUDED_DIRS_KEY, GCONF_VALUE_STRING,
 			       l, NULL);
 
 	g_slist_foreach (l, (GFunc) g_free, NULL);
@@ -108,7 +108,7 @@ enable_home_cb (GtkToggleButton *togglebutton, gpointer user_data)
 	enable = gtk_toggle_button_get_active (togglebutton);
 
 	gconf_client_set_bool (baobab.gconf_client,
-			       PROPS_ENABLE_HOME_MONITOR,
+			       BAOBAB_ENABLE_HOME_MONITOR_KEY,
 			       enable,
 			       NULL);
 
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
index 39a956e..ac7d503 100644
--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -570,7 +570,7 @@ baobab_toolbar_style (GConfClient *client,
 	gchar *toolbar_setting;
 
 	toolbar_setting = baobab_gconf_get_string_with_default (baobab.gconf_client,
-								SYSTEM_TOOLBAR_STYLE,
+								SYSTEM_TOOLBAR_STYLE_KEY,
 								"both");
 
 	if (!strcmp(toolbar_setting, "icons")) {
@@ -691,7 +691,7 @@ store_excluded_locations (void)
 	}
 
 	gconf_client_set_list (baobab.gconf_client,
-			       PROPS_SCAN_KEY,
+			       BAOBAB_EXCLUDED_DIRS_KEY,
 			       GCONF_VALUE_STRING, 
 			       uri_list,
 			       NULL);
@@ -729,7 +729,7 @@ excluded_locations_changed (GConfClient *client,
 	GSList *uris;
 
 	uris = 	gconf_client_get_list (client,
-				       PROPS_SCAN_KEY,
+				       BAOBAB_EXCLUDED_DIRS_KEY,
 				       GCONF_VALUE_STRING,
 				       NULL);
 	baobab_set_excluded_locations (uris);
@@ -750,7 +750,7 @@ baobab_monitor_home_toggled (GConfClient *client,
 			     gpointer user_data)
 {
 	baobab.monitor_home = gconf_client_get_bool (baobab.gconf_client,
-						     PROPS_ENABLE_HOME_MONITOR,
+						     BAOBAB_ENABLE_HOME_MONITOR_KEY,
 						     NULL);
 }
 
@@ -859,17 +859,17 @@ baobab_init (void)
 	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, PROPS_SCAN_KEY, excluded_locations_changed,
+	gconf_client_notify_add (baobab.gconf_client, BAOBAB_EXCLUDED_DIRS_KEY, excluded_locations_changed,
 				 NULL, NULL, NULL);
-	gconf_client_notify_add (baobab.gconf_client, SYSTEM_TOOLBAR_STYLE, baobab_toolbar_style,
+	gconf_client_notify_add (baobab.gconf_client, SYSTEM_TOOLBAR_STYLE_KEY, baobab_toolbar_style,
 				 NULL, NULL, NULL);				 
 	gconf_client_notify_add (baobab.gconf_client, BAOBAB_SUBFLSTIPS_VISIBLE_KEY, baobab_subfolderstips_toggled,
 				 NULL, NULL, NULL);
-	gconf_client_notify_add (baobab.gconf_client, PROPS_ENABLE_HOME_MONITOR, baobab_monitor_home_toggled,
+	gconf_client_notify_add (baobab.gconf_client, BAOBAB_ENABLE_HOME_MONITOR_KEY, baobab_monitor_home_toggled,
 				 NULL, NULL, NULL);
 
 	uri_list = gconf_client_get_list (baobab.gconf_client,
-						      PROPS_SCAN_KEY,
+						      BAOBAB_EXCLUDED_DIRS_KEY,
 						      GCONF_VALUE_STRING,
 						      NULL);
 
@@ -887,7 +887,7 @@ baobab_init (void)
 	monitor_volume ();
 
 	baobab.monitor_home = gconf_client_get_bool (baobab.gconf_client,
-						     PROPS_ENABLE_HOME_MONITOR,
+						     BAOBAB_ENABLE_HOME_MONITOR_KEY,
 						     NULL);
 
 	monitor_home_dir ();
diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h
index 4b66810..f7a009f 100644
--- a/baobab/src/baobab.h
+++ b/baobab/src/baobab.h
@@ -19,12 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, 
  * Boston, MA  02110-1301  USA
  */
- 
 
 #ifndef __BAOBAB_H__
 #define __BAOBAB_H__
 
-
 #include <time.h>
 #include <sys/types.h>
 #include <glib.h>
@@ -39,13 +37,14 @@ struct BaobabSearchOpt;
 #define BAOBAB_UI_FILE PKGDATADIR "/baobab-main-window.ui"
 #define BAOBAB_DIALOG_SCAN_UI_FILE PKGDATADIR "/baobab-dialog-scan-props.ui"
 
+/* Settings */
 #define BAOBAB_KEY_DIR "/apps/baobab"
 #define BAOBAB_TOOLBAR_VISIBLE_KEY	BAOBAB_KEY_DIR "/ui/toolbar_visible"
 #define BAOBAB_STATUSBAR_VISIBLE_KEY	BAOBAB_KEY_DIR "/ui/statusbar_visible"
 #define BAOBAB_SUBFLSTIPS_VISIBLE_KEY   BAOBAB_KEY_DIR "/ui/baobab_subfoldertips_visible"
-#define PROPS_SCAN_KEY			BAOBAB_KEY_DIR "/properties/skip_scan_uri_list"
-#define PROPS_ENABLE_HOME_MONITOR	BAOBAB_KEY_DIR "/properties/enable_home_monitor"
-#define SYSTEM_TOOLBAR_STYLE		"/desktop/gnome/interface/toolbar_style"
+#define BAOBAB_EXCLUDED_DIRS_KEY	BAOBAB_KEY_DIR "/properties/skip_scan_uri_list"
+#define BAOBAB_ENABLE_HOME_MONITOR_KEY	BAOBAB_KEY_DIR "/properties/enable_home_monitor"
+#define SYSTEM_TOOLBAR_STYLE_KEY	"/desktop/gnome/interface/toolbar_style"
 
 typedef struct _ContextMenu ContextMenu;
 
@@ -61,8 +60,8 @@ struct _ContextMenu {
 
 struct _baobab_application {
 	GtkBuilder *main_ui;
-  	GtkWidget *window;
-  	GtkWidget *tree_view;
+	GtkWidget *window;
+	GtkWidget *tree_view;
 	GtkWidget *rings_chart;
 	GtkWidget *treemap_chart;
 	GtkWidget *current_chart;