[evolution/wip/gsettings: 27/29] Port EComposerHeaderTable to GSettings

[Rodrigo Moya <rodrigo src gnome org>]

commit ff8b1650ead99d8507469ff1fcf4805d6451ba93
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Oct 13 17:44:28 2011 +0200

    Port EComposerHeaderTable to GSettings

 composer/e-composer-header-table.c     |   56 ++++++++++++--------------------
 modules/calendar/e-cal-shell-content.c |    8 +----
 2 files changed, 22 insertions(+), 42 deletions(-)
---
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 2dd94eb..5083ef3 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -25,7 +25,6 @@
 #include <libedataserverui/e-name-selector.h>
 
 #include <shell/e-shell.h>
-#include <e-util/gconf-bridge.h>
 #include <misc/e-signature-combo-box.h>
 
 #include "e-msg-composer.h"
@@ -63,7 +62,6 @@ enum {
 
 struct _EComposerHeaderTablePrivate {
 	EComposerHeader *headers[E_COMPOSER_NUM_HEADERS];
-	guint gconf_bindings[E_COMPOSER_NUM_HEADERS];
 	GtkWidget *signature_label;
 	GtkWidget *signature_combo_box;
 	ENameSelector *name_selector;
@@ -305,35 +303,30 @@ from_header_should_be_visible (EComposerHeaderTable *table)
 static void
 composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
 {
-	GConfBridge *bridge;
+	GSettings *settings;
 	gint ii;
 
-	bridge = gconf_bridge_get ();
+	settings = g_settings_new ("org.gnome.evolution.mail");
 
 	for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) {
 		EComposerHeader *header;
 		const gchar *key;
-		guint binding_id;
 		gboolean sensitive;
 		gboolean visible;
 
-		binding_id = table->priv->gconf_bindings[ii];
 		header = e_composer_header_table_get_header (table, ii);
 
-		if (binding_id > 0)
-			gconf_bridge_unbind (bridge, binding_id);
-
 		switch (ii) {
 			case E_COMPOSER_HEADER_BCC:
-				key = COMPOSER_GCONF_PREFIX "/show_mail_bcc";
+				key = "composer-show-bcc";
 				break;
 
 			case E_COMPOSER_HEADER_CC:
-				key = COMPOSER_GCONF_PREFIX "/show_mail_cc";
+				key = "composer-show-cc";
 				break;
 
 			case E_COMPOSER_HEADER_REPLY_TO:
-				key = COMPOSER_GCONF_PREFIX "/show_mail_reply_to";
+				key = "composer-show-reply-to";
 				break;
 
 			default:
@@ -365,42 +358,36 @@ composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
 		e_composer_header_set_sensitive (header, sensitive);
 		e_composer_header_set_visible (header, visible);
 
-		if (key != NULL)
-			binding_id = gconf_bridge_bind_property (
-				bridge, key, G_OBJECT (header), "visible");
-		else
-			binding_id = 0;
-
-		table->priv->gconf_bindings[ii] = binding_id;
+		if (key != NULL) {
+			g_settings_unbind (settings, key);
+			g_settings_bind (settings, key, G_OBJECT (header), "visible", G_SETTINGS_BIND_DEFAULT);
+		}
 	}
+
+	g_object_unref (settings);
 }
 
 static void
 composer_header_table_setup_post_headers (EComposerHeaderTable *table)
 {
-	GConfBridge *bridge;
+	GSettings *settings;
 	gint ii;
 
-	bridge = gconf_bridge_get ();
+	settings = g_settings_new ("org.gnome.evolution.mail");
 
 	for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) {
 		EComposerHeader *header;
 		const gchar *key;
-		guint binding_id;
 
-		binding_id = table->priv->gconf_bindings[ii];
 		header = e_composer_header_table_get_header (table, ii);
 
-		if (binding_id > 0)
-			gconf_bridge_unbind (bridge, binding_id);
-
 		switch (ii) {
 			case E_COMPOSER_HEADER_FROM:
-				key = COMPOSER_GCONF_PREFIX "/show_post_from";
+				key = "composer-show-post-from";
 				break;
 
 			case E_COMPOSER_HEADER_REPLY_TO:
-				key = COMPOSER_GCONF_PREFIX "/show_post_reply_to";
+				key = "composer-show-post-reply-to";
 				break;
 
 			default:
@@ -423,14 +410,13 @@ composer_header_table_setup_post_headers (EComposerHeaderTable *table)
 				break;
 		}
 
-		if (key != NULL)
-			binding_id = gconf_bridge_bind_property (
-				bridge, key, G_OBJECT (header), "visible");
-		else
-			binding_id = 0;
-
-		table->priv->gconf_bindings[ii] = binding_id;
+		if (key != NULL) {
+			g_settings_unbind (settings, key);
+			g_settings_bind (settings, key, G_OBJECT (header), "visible", G_SETTINGS_BIND_DEFAULT);
+		}
 	}
+
+	g_object_unref (settings);
 }
 
 static void
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 6c86f5f..5e60ecd 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -52,8 +52,6 @@ struct _ECalShellContentPrivate {
 	GtkWidget *memo_table;
 
 	GalViewInstance *view_instance;
-
-	gboolean paned_bound;
 };
 
 enum {
@@ -112,13 +110,11 @@ cal_shell_content_notify_view_id_cb (ECalShellContent *cal_shell_content)
 	EShellView *shell_view;
 	GSettings *settings;
 	GtkWidget *paned;
-	gboolean bound;
 	const gchar *key;
 	const gchar *view_id;
 
 	settings = g_settings_new ("org.gnome.evolution.calendar");
 	paned = cal_shell_content->priv->hpaned;
-	bound = cal_shell_content->priv->paned_bound;
 
 	shell_content = E_SHELL_CONTENT (cal_shell_content);
 	shell_view = e_shell_content_get_shell_view (shell_content);
@@ -129,11 +125,9 @@ cal_shell_content_notify_view_id_cb (ECalShellContent *cal_shell_content)
 	else
 		key = "hpane-position";
 
-	if (bound)
-		g_settings_unbind (settings, key);
+	g_settings_unbind (settings, key);
 
 	g_settings_bind (settings, key, G_OBJECT (paned), "hposition", G_SETTINGS_BIND_DEFAULT);
-	cal_shell_content->priv->paned_bound = TRUE;
 
 	g_object_unref (settings);
 }