diff options
author | Dan Vrátil <dvratil@redhat.com> | 2012-07-24 16:30:52 +0800 |
---|---|---|
committer | Dan Vrátil <dvratil@redhat.com> | 2012-07-24 16:30:52 +0800 |
commit | 0568c36bde3fde0baaf5602d0a22fcf5749d27d9 (patch) | |
tree | 3306204122b4ae98c225dea0387099daddca4e7c /mail/e-mail-reader-utils.c | |
parent | bb3487625b354038f490fdf30ffc4490fd31c035 (diff) | |
download | gsoc2013-evolution-0568c36bde3fde0baaf5602d0a22fcf5749d27d9.tar gsoc2013-evolution-0568c36bde3fde0baaf5602d0a22fcf5749d27d9.tar.gz gsoc2013-evolution-0568c36bde3fde0baaf5602d0a22fcf5749d27d9.tar.bz2 gsoc2013-evolution-0568c36bde3fde0baaf5602d0a22fcf5749d27d9.tar.lz gsoc2013-evolution-0568c36bde3fde0baaf5602d0a22fcf5749d27d9.tar.xz gsoc2013-evolution-0568c36bde3fde0baaf5602d0a22fcf5749d27d9.tar.zst gsoc2013-evolution-0568c36bde3fde0baaf5602d0a22fcf5749d27d9.zip |
Bug 677635 - Vanished message list with filled preview panel
Diffstat (limited to 'mail/e-mail-reader-utils.c')
-rw-r--r-- | mail/e-mail-reader-utils.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 3b0b0655b4..ae4a98b664 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -980,7 +980,7 @@ mail_reader_get_message_to_print_ready_cb (GObject *object, e_mail_reader_parse_message ( context->reader, context->folder, context->message_uid, - message, mail_reader_do_print_message, context); + message, NULL, mail_reader_do_print_message, context); } void @@ -1300,7 +1300,7 @@ mail_reader_get_message_ready_cb (CamelFolder *folder, g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message)); e_mail_reader_parse_message (context->reader, context->folder, - context->message_uid, message, + context->message_uid, message, NULL, mail_reader_reply_message_parsed, context); } @@ -1995,6 +1995,7 @@ e_mail_reader_parse_message (EMailReader *reader, CamelFolder *folder, const gchar *message_uid, CamelMimeMessage *message, + GCancellable *cancellable, GAsyncReadyCallback ready_callback, gpointer user_data) { @@ -2007,6 +2008,8 @@ e_mail_reader_parse_message (EMailReader *reader, data = g_new0 (struct mail_reader_parse_message_run_data_, 1); data->activity = e_mail_reader_new_activity (reader); e_activity_set_text (data->activity, _("Parsing message")); + if (cancellable) + e_activity_set_cancellable (data->activity, cancellable); data->folder = g_object_ref (folder); data->message = g_object_ref (message); data->message_uid = g_strdup (message_uid); |