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.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.c')
| -rw-r--r-- | widgets/misc/e-attachment.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 4174fe92a5..166020596e 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -153,25 +153,23 @@ create_system_thumbnail (EAttachment *attachment, static gchar * attachment_get_default_charset (void) { - GConfClient *client; - const gchar *key; + GSettings *settings; gchar *charset; /* XXX This doesn't really belong here. */ - client = gconf_client_get_default (); - key = "/apps/evolution/mail/composer/charset"; - charset = gconf_client_get_string (client, key, NULL); + settings = g_settings_new ("org.gnome.evolution.mail"); + charset = g_settings_get_string (settings, "composer-charset"); if (charset == NULL || *charset == '\0') { g_free (charset); - key = "/apps/evolution/mail/format/charset"; - charset = gconf_client_get_string (client, key, NULL); + /* FIXME: this was "/apps/evolution/mail/format/charset", not sure it relates to "charset" */ + charset = g_settings_get_string (settings, "charset"); if (charset == NULL || *charset == '\0') { g_free (charset); charset = NULL; } } - g_object_unref (client); + g_object_unref (settings); if (charset == NULL) charset = g_strdup (camel_iconv_locale_charset ()); |