diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:48:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:48:44 +0800 |
| commit | 9918361aef9ad1360a0ed3a240cc58d6cd9e30f8 (patch) | |
| tree | 50bf24934b5ab3fefcc27913d1855a27c75e6d40 /widgets/misc/e-attachment-paned.c | |
| parent | fa1bb9a17e11cf12ce02d9b49bba2753f6020ea0 (diff) | |
| parent | e64d6fe05c30c2cc1d7625a202afba3ba2da07cd (diff) | |
| download | gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.gz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.bz2 gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.lz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.xz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.zst gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.zip | |
Merge branch 'wip/gsettings'
Diffstat (limited to 'widgets/misc/e-attachment-paned.c')
| -rw-r--r-- | widgets/misc/e-attachment-paned.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index 2903c84227..c5fb9b43b5 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -27,8 +27,6 @@ #include <glib/gi18n.h> -#include "e-util/gconf-bridge.h" - #include "e-attachment-view.h" #include "e-attachment-store.h" #include "e-attachment-icon-view.h" @@ -346,12 +344,11 @@ static void attachment_paned_constructed (GObject *object) { EAttachmentPanedPrivate *priv; - GConfBridge *bridge; - const gchar *key; + GSettings *settings; priv = E_ATTACHMENT_PANED (object)->priv; - bridge = gconf_bridge_get (); + settings = g_settings_new ("org.gnome.evolution.shell"); /* Set up property-to-property bindings. */ @@ -409,10 +406,9 @@ attachment_paned_constructed (GObject *object) G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - /* Set up property-to-GConf bindings. */ - - key = "/apps/evolution/shell/attachment_view"; - gconf_bridge_bind_property (bridge, key, object, "active-view"); + /* Set up property-to-GSettings bindings. */ + g_settings_bind (settings, "attachment-view", object, "active-view", G_SETTINGS_BIND_DEFAULT); + g_object_unref (settings); /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (e_attachment_paned_parent_class)->constructed (object); |