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/mail-session.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/mail-session.c')
-rw-r--r-- | mail/mail-session.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mail/mail-session.c b/mail/mail-session.c index c3ba26cb10..dbe886d69a 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -478,7 +478,8 @@ get_folder (CamelFilterDriver *d, gpointer data, GError **error) { - return mail_tool_uri_to_folder (uri, 0, error); + /* FIXME Not passing a GCancellable here. */ + return mail_tool_uri_to_folder (uri, 0, NULL, error); } static void @@ -636,7 +637,7 @@ static gpointer ms_thread_msg_new (CamelSession *session, CamelSessionThreadOps msg->data = m; g_object_unref (msg->op); - msg->op = g_object_ref (m->cancel); + msg->op = g_object_ref (m->cancellable); } return msg; @@ -780,7 +781,8 @@ ms_forward_to (CamelSession *session, /* and send it */ info = camel_message_info_new (NULL); out_folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX); - camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); + camel_message_info_set_flags ( + info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); mail_append_mail (out_folder, forward, info, ms_forward_to_cb, NULL); return TRUE; |