diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-02 11:18:28 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-02 11:18:28 +0800 |
| commit | c30d29425eccafea02e95ea6e81679508c878784 (patch) | |
| tree | 43881a8ae0b03d55cc6facac3b4e6375524c7c4c /mail/e-mail-reader-utils.c | |
| parent | 6c7520b73d1360504672804ebeba6c4de18de318 (diff) | |
| download | gsoc2013-evolution-c30d29425eccafea02e95ea6e81679508c878784.tar gsoc2013-evolution-c30d29425eccafea02e95ea6e81679508c878784.tar.gz gsoc2013-evolution-c30d29425eccafea02e95ea6e81679508c878784.tar.bz2 gsoc2013-evolution-c30d29425eccafea02e95ea6e81679508c878784.tar.lz gsoc2013-evolution-c30d29425eccafea02e95ea6e81679508c878784.tar.xz gsoc2013-evolution-c30d29425eccafea02e95ea6e81679508c878784.tar.zst gsoc2013-evolution-c30d29425eccafea02e95ea6e81679508c878784.zip | |
Coding style and whitespace cleanup.
Diffstat (limited to 'mail/e-mail-reader-utils.c')
| -rw-r--r-- | mail/e-mail-reader-utils.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 10110734ae..6f7aec337d 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -671,13 +671,16 @@ e_mail_reader_header_free (EMailReaderHeader *header) } static void -headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailReader *reader) +headers_changed_cb (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + EMailReader *reader) { EMFormat *emf; EMFormatHTMLDisplay *emfhd; GSList *header_config_list, *p; - g_return_if_fail (gconf != NULL); + g_return_if_fail (client != NULL); g_return_if_fail (reader != NULL); emfhd = e_mail_reader_get_html_display (reader); @@ -687,7 +690,9 @@ headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailR emf = EM_FORMAT (emfhd); g_return_if_fail (emf != NULL); - header_config_list = gconf_client_get_list (gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL); + header_config_list = gconf_client_get_list ( + client, "/apps/evolution/mail/display/headers", + GCONF_VALUE_STRING, NULL); em_format_clear_headers (emf); for (p = header_config_list; p; p = g_slist_next(p)) { EMailReaderHeader *h; @@ -715,16 +720,16 @@ headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailR static void remove_header_notify_cb (gpointer data) { - GConfClient *gconf = mail_config_get_gconf_client (); + GConfClient *client = mail_config_get_gconf_client (); guint notify_id; - g_return_if_fail (gconf != NULL); + g_return_if_fail (client != NULL); notify_id = GPOINTER_TO_INT (data); g_return_if_fail (notify_id != 0); - gconf_client_notify_remove (gconf, notify_id); - gconf_client_remove_dir (gconf, "/apps/evolution/mail/display", NULL); + gconf_client_notify_remove (client, notify_id); + gconf_client_remove_dir (client, "/apps/evolution/mail/display", NULL); } /** @@ -737,13 +742,20 @@ remove_header_notify_cb (gpointer data) void e_mail_reader_connect_headers (EMailReader *reader) { - GConfClient *gconf = mail_config_get_gconf_client (); + GConfClient *client = mail_config_get_gconf_client (); guint notify_id; - gconf_client_add_dir (gconf, "/apps/evolution/mail/display", GCONF_CLIENT_PRELOAD_NONE, NULL); - notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/display/headers", (GConfClientNotifyFunc) headers_changed_cb, reader, NULL, NULL); + gconf_client_add_dir ( + client, "/apps/evolution/mail/display", + GCONF_CLIENT_PRELOAD_NONE, NULL); + notify_id = gconf_client_notify_add ( + client, "/apps/evolution/mail/display/headers", + (GConfClientNotifyFunc) headers_changed_cb, + reader, NULL, NULL); - g_object_set_data_full (G_OBJECT (reader), "reader-header-notify-id", GINT_TO_POINTER (notify_id), remove_header_notify_cb); + g_object_set_data_full ( + G_OBJECT (reader), "reader-header-notify-id", + GINT_TO_POINTER (notify_id), remove_header_notify_cb); - headers_changed_cb (gconf, 0, NULL, reader); + headers_changed_cb (client, 0, NULL, reader); } |