diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-04-01 00:08:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-04-01 03:48:01 +0800 |
| commit | 9ed9a99baddcb87eab366e4f939dc146f2db9401 (patch) | |
| tree | b4fb0824904a261fa671973d9a499ed4328c0689 /mail/e-mail-reader.c | |
| parent | d15cd735886c38ac4c14faa816c307ce8f388844 (diff) | |
| download | gsoc2013-evolution-9ed9a99baddcb87eab366e4f939dc146f2db9401.tar gsoc2013-evolution-9ed9a99baddcb87eab366e4f939dc146f2db9401.tar.gz gsoc2013-evolution-9ed9a99baddcb87eab366e4f939dc146f2db9401.tar.bz2 gsoc2013-evolution-9ed9a99baddcb87eab366e4f939dc146f2db9401.tar.lz gsoc2013-evolution-9ed9a99baddcb87eab366e4f939dc146f2db9401.tar.xz gsoc2013-evolution-9ed9a99baddcb87eab366e4f939dc146f2db9401.tar.zst gsoc2013-evolution-9ed9a99baddcb87eab366e4f939dc146f2db9401.zip | |
EMFormat: Add "session" as a constructor property.
Pass it in instead of digging it out of EShellSettings.
Diffstat (limited to 'mail/e-mail-reader.c')
| -rw-r--r-- | mail/e-mail-reader.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 0106b6ed53..4940fbe321 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -3099,6 +3099,8 @@ mail_reader_set_display_formatter_for_message (EMailReader *reader, } if ((formatter = g_hash_table_lookup (formatters, mail_uri)) == NULL) { + EMailBackend *mail_backend; + EMailSession *mail_session; struct _formatter_weak_ref_closure *formatter_data = g_new0 (struct _formatter_weak_ref_closure, 1); @@ -3107,7 +3109,12 @@ mail_reader_set_display_formatter_for_message (EMailReader *reader, formatter_data->formatters = g_hash_table_ref (formatters); formatter_data->mail_uri = g_strdup (mail_uri); - formatter = EM_FORMAT (em_format_html_display_new ()); + mail_backend = e_mail_reader_get_backend (reader); + mail_session = e_mail_backend_get_session (mail_backend); + + formatter = EM_FORMAT ( + em_format_html_display_new ( + CAMEL_SESSION (mail_session))); /* When no EMailDisplay holds reference to the formatter, then * the formatter can be destroyed. */ |