diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-18 05:19:13 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-19 00:32:37 +0800 |
| commit | 22ef5aa7e61bcea10169153932f100a0954942da (patch) | |
| tree | 18e81eaa672f1db6fcd6b32d9faa88515c378e3e /mail/e-mail-reader-utils.c | |
| parent | 35e55a8d6e3455efa92abd669680d191e3e4cbac (diff) | |
| download | gsoc2013-evolution-22ef5aa7e61bcea10169153932f100a0954942da.tar gsoc2013-evolution-22ef5aa7e61bcea10169153932f100a0954942da.tar.gz gsoc2013-evolution-22ef5aa7e61bcea10169153932f100a0954942da.tar.bz2 gsoc2013-evolution-22ef5aa7e61bcea10169153932f100a0954942da.tar.lz gsoc2013-evolution-22ef5aa7e61bcea10169153932f100a0954942da.tar.xz gsoc2013-evolution-22ef5aa7e61bcea10169153932f100a0954942da.tar.zst gsoc2013-evolution-22ef5aa7e61bcea10169153932f100a0954942da.zip | |
Kill mail_config_get_gconf_client().
Diffstat (limited to 'mail/e-mail-reader-utils.c')
| -rw-r--r-- | mail/e-mail-reader-utils.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 162e78bd36..794b25af83 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -795,16 +795,16 @@ headers_changed_cb (GConfClient *client, static void remove_header_notify_cb (gpointer data) { - GConfClient *client = mail_config_get_gconf_client (); + GConfClient *client; guint notify_id; - g_return_if_fail (client != NULL); - notify_id = GPOINTER_TO_INT (data); g_return_if_fail (notify_id != 0); + client = gconf_client_get_default (); gconf_client_notify_remove (client, notify_id); gconf_client_remove_dir (client, "/apps/evolution/mail/display", NULL); + g_object_unref (client); } /** @@ -817,9 +817,11 @@ remove_header_notify_cb (gpointer data) void e_mail_reader_connect_headers (EMailReader *reader) { - GConfClient *client = mail_config_get_gconf_client (); + GConfClient *client; guint notify_id; + client = gconf_client_get_default (); + gconf_client_add_dir ( client, "/apps/evolution/mail/display", GCONF_CLIENT_PRELOAD_NONE, NULL); @@ -833,4 +835,6 @@ e_mail_reader_connect_headers (EMailReader *reader) GINT_TO_POINTER (notify_id), remove_header_notify_cb); headers_changed_cb (client, 0, NULL, reader); + + g_object_unref (client); } |