aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--em-format/em-format-quote.c11
-rw-r--r--em-format/em-format.c11
2 files changed, 10 insertions, 12 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 (
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 40f9baa3d5..b83d39e6b9 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -1366,7 +1366,7 @@ em_format_format_text (EMFormat *emf,
const gchar *key;
gsize size;
gsize max;
- GConfClient *gconf;
+ GSettings *settings;
if (emf->charset) {
charset = emf->charset;
@@ -1411,15 +1411,14 @@ em_format_format_text (EMFormat *emf,
max = -1;
- gconf = gconf_client_get_default ();
- key = "/apps/evolution/mail/display/force_message_limit";
- if (gconf_client_get_bool (gconf, key, NULL)) {
+ settings = g_settings_new ("org.gnome.evolution.mail");
+ if (g_settings_get_boolean (settings, "force-message-limit")) {
key = "/apps/evolution/mail/display/message_text_part_limit";
- max = gconf_client_get_int (gconf, key, NULL);
+ max = g_settings_get_int (settings, "message-text-part-limit");
if (max == 0)
max = -1;
}
- g_object_unref (gconf);
+ g_object_unref (settings);
size = camel_data_wrapper_decode_to_stream_sync (
emf->mode == EM_FORMAT_MODE_SOURCE ?