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/message-list.c | |
parent | 2c21832faab43a176dcb37bc2c65e9e3fb55fc9f (diff) | |
download | gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.gz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.zst gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.zip |
Pass GCancellable to Camel.
Diffstat (limited to 'mail/message-list.c')
-rw-r--r-- | mail/message-list.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/mail/message-list.c b/mail/message-list.c index ff7350a327..c6a8092046 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -937,9 +937,12 @@ message_list_copy (MessageList *ml, gboolean cut) camel_folder_freeze (ml->folder); for (i=0;i<uids->len;i++) - camel_folder_set_message_flags (ml->folder, uids->pdata[i], - CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED, - CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED); + camel_folder_set_message_flags ( + ml->folder, uids->pdata[i], + CAMEL_MESSAGE_SEEN | + CAMEL_MESSAGE_DELETED, + CAMEL_MESSAGE_SEEN | + CAMEL_MESSAGE_DELETED); camel_folder_thaw (ml->folder); } @@ -2108,8 +2111,9 @@ ml_selection_received (GtkWidget *widget, return; } + /* FIXME Not passing a GCancellable or GError here. */ em_utils_selection_get_uidlist ( - selection_data, ml->folder, FALSE, NULL); + selection_data, ml->folder, FALSE, NULL, NULL); } static void @@ -2176,6 +2180,7 @@ ml_drop_async_exec (struct _drop_msg *m) em_utils_selection_get_uidlist ( m->selection, m->folder, m->action == GDK_ACTION_MOVE, + m->base.cancellable, &m->base.error); break; case DND_MESSAGE_RFC822: @@ -4514,7 +4519,7 @@ regen_list_exec (struct _regen_list_msg *m) e_profile_event_emit("list.threaduids", m->folder->full_name, 0); /* camel_folder_summary_prepare_fetch_all (m->folder->summary, NULL); */ - if (!camel_operation_cancel_check (m->base.cancel)) { + if (!g_cancellable_is_cancelled (m->base.cancellable)) { /* update/build a new tree */ if (m->dotree) { ml_sort_uids_by_tree (m->ml, uids); @@ -4557,7 +4562,7 @@ regen_list_done (struct _regen_list_msg *m) if (!m->complete) return; - if (camel_operation_cancel_check (m->base.cancel)) + if (g_cancellable_is_cancelled (m->base.cancellable)) return; if (m->ml->folder != m->folder) @@ -4744,8 +4749,9 @@ mail_regen_cancel (MessageList *ml) while (l) { MailMsg *mm = l->data; - if (mm->cancel) - camel_operation_cancel (mm->cancel); + if (mm->cancellable) + camel_operation_cancel ( + CAMEL_OPERATION (mm->cancellable)); l = l->next; } |