diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-20 01:32:26 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-20 01:41:14 +0800 |
commit | d305e8ff1052c9ec109a0d220c05c669e2180662 (patch) | |
tree | e4bfa16c9165be5159b0a07f5d0e006f20f30019 /mail/e-mail-reader-utils.c | |
parent | 689bb1148d8494b71036f9dcce8a9f79b53cbfe6 (diff) | |
download | gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.tar gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.tar.gz gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.tar.bz2 gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.tar.lz gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.tar.xz gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.tar.zst gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.zip |
Reduce GConf usage in em-composer-utils.c.
To reduce GConf usage in em-composer-utils.c:
- Relevant functions in em-composer-utils.c now take arguments for
reply and forward styles.
- Redundant forwarding functions were removed:
em_utils_forward_attached()
em_utils_forward_inline()
em_utils_forward_quoted()
- EMailReader now has "forward-style" and "reply-style" properties,
which get bound to the appropriate EShellSettings properties in
modules/mail/e-mail-config-reader.c. These same EShellSettings
properties are bound to the combo boxes in Composer Preferences.
Diffstat (limited to 'mail/e-mail-reader-utils.c')
-rw-r--r-- | mail/e-mail-reader-utils.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 84fdfd8c16..a049e6eb84 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -392,7 +392,7 @@ html_contains_nonwhitespace (const gchar *html, void e_mail_reader_reply_to_message (EMailReader *reader, CamelMimeMessage *src_message, - gint reply_mode) + EMailReplyType reply_type) { EShell *shell; EMailBackend *backend; @@ -401,6 +401,7 @@ e_mail_reader_reply_to_message (EMailReader *reader, GtkWidget *message_list; CamelMimeMessage *new_message; CamelFolder *folder; + EMailReplyStyle reply_style; EWebView *web_view; struct _camel_header_raw *header; const gchar *uid; @@ -417,6 +418,7 @@ e_mail_reader_reply_to_message (EMailReader *reader, folder = e_mail_reader_get_folder (reader); formatter = e_mail_reader_get_formatter (reader); message_list = e_mail_reader_get_message_list (reader); + reply_style = e_mail_reader_get_reply_style (reader); shell_backend = E_SHELL_BACKEND (backend); shell = e_shell_backend_get_shell (shell_backend); @@ -469,7 +471,8 @@ e_mail_reader_reply_to_message (EMailReader *reader, g_object_unref (src_message); em_utils_reply_to_message ( - shell, folder, uid, new_message, reply_mode, NULL); + shell, folder, uid, new_message, + reply_type, reply_style, NULL); g_free (selection); @@ -478,7 +481,7 @@ e_mail_reader_reply_to_message (EMailReader *reader, whole_message: em_utils_reply_to_message ( shell, folder, uid, src_message, - reply_mode, EM_FORMAT (formatter)); + reply_type, reply_style, EM_FORMAT (formatter)); } void |