diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-08 23:04:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-28 23:35:55 +0800 |
| commit | a91eeb647138ee035444cdc3c265fa4e95898f29 (patch) | |
| tree | 63b5712bc407630d6ad6e504244e6cc4ebc35a86 /mail/e-mail-reader.c | |
| parent | 2c21832faab43a176dcb37bc2c65e9e3fb55fc9f (diff) | |
| download | gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.gz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.bz2 gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.lz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.xz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.zst gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.zip | |
Pass GCancellable to Camel.
Diffstat (limited to 'mail/e-mail-reader.c')
| -rw-r--r-- | mail/e-mail-reader.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 68cae17828..9eda80a5a5 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1353,6 +1353,7 @@ action_mail_toggle_important_cb (GtkAction *action, flags ^= CAMEL_MESSAGE_FLAGGED; if (flags & CAMEL_MESSAGE_FLAGGED) flags &= ~CAMEL_MESSAGE_DELETED; + camel_folder_set_message_flags ( folder, uids->pdata[ii], CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_DELETED, flags); @@ -2233,8 +2234,10 @@ mail_reader_message_loaded_cb (CamelFolder *folder, (EEvent *) event, "message.reading", (EEventTarget *) target); + /* FIXME Need to pass a GCancellable. */ em_format_format ( - EM_FORMAT (formatter), folder, message_uid, message); + EM_FORMAT (formatter), folder, + message_uid, message, NULL); /* Reset the shell view icon. */ e_shell_event (shell, "mail-icon", (gpointer) "evolution-mail"); @@ -2355,7 +2358,9 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader) priv->retrieving_message_operation_id = op_id; } } else { - em_format_format (EM_FORMAT (formatter), NULL, NULL, NULL); + /* FIXME Need to pass a GCancellable. */ + em_format_format ( + EM_FORMAT (formatter), NULL, NULL, NULL, NULL); priv->restoring_message_selection = FALSE; } @@ -2490,7 +2495,8 @@ mail_reader_set_folder (EMailReader *reader, em_utils_folder_is_outbox (folder, folder_uri) || em_utils_folder_is_sent (folder, folder_uri)); - em_format_format (EM_FORMAT (formatter), NULL, NULL, NULL); + /* FIXME Need to pass a GCancellable. */ + em_format_format (EM_FORMAT (formatter), NULL, NULL, NULL, NULL); priv->folder_was_just_selected = (folder != NULL); |