aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-attachment.c
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-10-13 19:55:54 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-10-13 19:55:54 +0800
commit93f489a9a4bebc6b1f2331ba2aa5804669b41a9a (patch)
tree3ed30ae0fa8a6881030b470366a269ab3a23b8e0 /widgets/misc/e-attachment.c
parentc94f0cf7538bae7e740d58893a8bfcf7eca49c97 (diff)
downloadgsoc2013-evolution-93f489a9a4bebc6b1f2331ba2aa5804669b41a9a.tar
gsoc2013-evolution-93f489a9a4bebc6b1f2331ba2aa5804669b41a9a.tar.gz
gsoc2013-evolution-93f489a9a4bebc6b1f2331ba2aa5804669b41a9a.tar.bz2
gsoc2013-evolution-93f489a9a4bebc6b1f2331ba2aa5804669b41a9a.tar.lz
gsoc2013-evolution-93f489a9a4bebc6b1f2331ba2aa5804669b41a9a.tar.xz
gsoc2013-evolution-93f489a9a4bebc6b1f2331ba2aa5804669b41a9a.tar.zst
gsoc2013-evolution-93f489a9a4bebc6b1f2331ba2aa5804669b41a9a.zip
Port misc widgets to use GSettings
Diffstat (limited to 'widgets/misc/e-attachment.c')
-rw-r--r--widgets/misc/e-attachment.c14
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 ());