[gnome-bluetooth/gnome-2-32] Port applet to GSettings

[Bastien Nocera <hadess src gnome org>]

commit 1bca328742352e1e260a5f9ae4ce723e2e6dee51
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Apr 20 17:04:21 2010 +0100

    Port applet to GSettings

 applet/main.c |   46 ++++++++++++++--------------------------------
 1 files changed, 14 insertions(+), 32 deletions(-)
---
diff --git a/applet/main.c b/applet/main.c
index b99c16d..b772338 100644
--- a/applet/main.c
+++ b/applet/main.c
@@ -29,7 +29,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <gconf/gconf-client.h>
 #include <unique/uniqueapp.h>
 
 #include <bluetooth-client.h>
@@ -48,8 +47,8 @@ static guint num_adapters_powered = 0;
 static gboolean show_icon_pref = TRUE;
 static gboolean discover_lock = FALSE;
 
-#define PREF_DIR		"/apps/bluetooth-manager"
-#define PREF_SHOW_ICON		PREF_DIR "/show_icon"
+#define SCHEMA_NAME		"org.gnome.Bluetooth"
+#define PREF_SHOW_ICON		"show-icon"
 
 #define KEYBOARD_PREFS		"gnome-keyboard-properties"
 #define MOUSE_PREFS		"gnome-mouse-properties"
@@ -63,7 +62,7 @@ enum {
 	DISCONNECTING
 };
 
-static GConfClient* gconf;
+static GSettings *settings;
 static BluetoothKillswitch *killswitch = NULL;
 
 static GtkBuilder *xml = NULL;
@@ -1064,20 +1063,13 @@ static void device_removed(GtkTreeModel *model,
 	device_changed (model, path, NULL, user_data);
 }
 
-static void gconf_callback(GConfClient *client, guint cnxn_id,
-					GConfEntry *entry, gpointer user_data)
+static void
+show_icon_changed (GSettings *settings,
+		   const char *key,
+		   gpointer   user_data)
 {
-	GConfValue *value;
-
-	value = gconf_entry_get_value(entry);
-	if (value == NULL)
-		return;
-
-	if (g_str_equal(entry->key, PREF_SHOW_ICON) == TRUE) {
-		show_icon_pref = gconf_value_get_bool(value);
-		update_icon_visibility();
-		return;
-	}
+	show_icon_pref = g_settings_get_boolean (settings, PREF_SHOW_ICON);
+	update_icon_visibility();
 }
 
 static GOptionEntry options[] = {
@@ -1090,7 +1082,6 @@ int main(int argc, char *argv[])
 	UniqueApp *app;
 	GtkStatusIcon *statusicon;
 	GtkWidget *menu;
-	GConfValue *value;
 	GOptionContext *context;
 	GError *error = NULL;
 
@@ -1150,20 +1141,11 @@ int main(int argc, char *argv[])
 					  bluetooth_killswitch_get_state (killswitch));
 	}
 
-	gconf = gconf_client_get_default();
-
-	value = gconf_client_get (gconf, PREF_SHOW_ICON, NULL);
-	if (value == NULL) {
-		show_icon_pref = TRUE;
-	} else {
-		show_icon_pref = gconf_value_get_bool (value);
-		gconf_value_free (value);
-	}
-
-	gconf_client_add_dir(gconf, PREF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
+	settings = g_settings_new (SCHEMA_NAME);
+	show_icon_pref = g_settings_get_boolean (settings, PREF_SHOW_ICON);
 
-	gconf_client_notify_add(gconf, PREF_DIR,
-					gconf_callback, NULL, NULL, NULL);
+	g_signal_connect (G_OBJECT (settings), "changed::" PREF_SHOW_ICON,
+			  G_CALLBACK (show_icon_changed), NULL);
 
 	statusicon = init_notification();
 
@@ -1180,7 +1162,7 @@ int main(int argc, char *argv[])
 
 	gtk_widget_destroy(menu);
 
-	g_object_unref(gconf);
+	g_object_unref(settings);
 
 	cleanup_agents();