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 /em-format/em-format-quote.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 'em-format/em-format-quote.c')
-rw-r--r-- | em-format/em-format-quote.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c index e6e71187c1..fbbd3bcd78 100644 --- a/em-format/em-format-quote.c +++ b/em-format/em-format-quote.c @@ -28,7 +28,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <gconf/gconf-client.h> #include "em-inline-filter.h" #include "em-stripsig-filter.h" @@ -88,7 +87,7 @@ emfq_format_clone (EMFormat *emf, { EMFormatQuote *emfq = (EMFormatQuote *) emf; const EMFormatHandler *handle; - GConfClient *gconf; + GSettings *settings; /* Chain up to parent's format_clone() method. */ EM_FORMAT_CLASS (parent_class)->format_clone ( @@ -98,12 +97,12 @@ emfq_format_clone (EMFormat *emf, G_SEEKABLE (emfq->priv->stream), 0, G_SEEK_SET, NULL, NULL); - gconf = gconf_client_get_default (); - if (gconf_client_get_bool ( - gconf, "/apps/evolution/mail/composer/top_signature", NULL)) + settings = g_settings_new ("org.gnome.evolution.mail"); + if (g_settings_get_boolean ( + settings, "composer-top-signature")) camel_stream_write_string ( emfq->priv->stream, "<br>\n", cancellable, NULL); - g_object_unref (gconf); + g_object_unref (settings); handle = em_format_find_handler(emf, "x-evolution/message/prefix"); if (handle) handle->handler ( |