[evolution/wip/gsettings: 15/15] Some more migration to GSettings in the mail component

[Rodrigo Moya <rodrigo src gnome org>]

commit 27cea70f2b693223db47cdb974a9f1871a8ff4fb
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Fri Oct 14 16:03:10 2011 +0200

    Some more migration to GSettings in the mail component

 mail/e-mail-folder-pane.c |    1 -
 mail/e-mail-paned-view.c  |   16 +++++++---------
 mail/em-account-editor.c  |    1 -
 3 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index e9aa029..4642bd7 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -30,7 +30,6 @@
 
 #include "e-util/e-util.h"
 #include "e-util/e-plugin-ui.h"
-#include "e-util/gconf-bridge.h"
 #include "shell/e-shell.h"
 #include "shell/e-shell-utils.h"
 #include "widgets/misc/e-popup-action.h"
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index c9ebb8a..63d0c2e 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -30,7 +30,6 @@
 #include <libedataserver/e-data-server-util.h>
 
 #include "e-util/e-util-private.h"
-#include "e-util/gconf-bridge.h"
 #include "widgets/menus/gal-view-etable.h"
 #include "widgets/menus/gal-view-instance.h"
 #include "widgets/misc/e-paned.h"
@@ -215,23 +214,22 @@ mail_paned_view_restore_state_cb (EShellWindow *shell_window,
                                   EMailPanedView *view)
 {
 	EMailPanedViewPrivate *priv;
-	GConfBridge *bridge;
+	GSettings *settings;
 	GObject *object;
-	const gchar *key;
 
 	priv = E_MAIL_PANED_VIEW (view)->priv;
 
-	/* Bind GObject properties to GConf keys. */
+	/* Bind GObject properties to GSettings keys. */
 
-	bridge = gconf_bridge_get ();
+	settings = g_settings_new ("org.gnome.evolution.mail");
 
 	object = G_OBJECT (priv->paned);
-	key = "/apps/evolution/mail/display/hpaned_size";
-	gconf_bridge_bind_property (bridge, key, object, "hposition");
+	g_settings_bind (settings, "hpaned-size", object, "hposition", G_SETTINGS_BIND_DEFAULT);
 
 	object = G_OBJECT (priv->paned);
-	key = "/apps/evolution/mail/display/paned_size";
-	gconf_bridge_bind_property (bridge, key, object, "vposition");
+	g_settings_bind (settings, "paned-size", object, "vposition", G_SETTINGS_BIND_DEFAULT);
+
+	g_object_unref (settings);
 }
 
 static void
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index b8510b8..054518c 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -43,7 +43,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <gconf/gconf-client.h>
 #include <libedataserverui/e-passwords.h>
 
 #include "shell/e-shell.h"