diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-29 21:32:50 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-29 21:33:36 +0800 |
| commit | e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b (patch) | |
| tree | 86234111f2facee6e45c4247b33d0f9050ad706c /modules | |
| parent | 6ec1118c92dcdf1f8377efde3ea575b5bc94412a (diff) | |
| download | gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.tar.gz gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.tar.zst gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.zip | |
camel_operation_new() now returns a GCancellable pointer.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.h | 2 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index f023e1b263..9fbfadde31 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -153,7 +153,7 @@ struct _EMailShellViewPrivate { /* Search folders for interactive search. */ CamelVeeFolder *search_account_all; CamelVeeFolder *search_account_current; - CamelOperation *search_account_cancel; + GCancellable *search_account_cancel; guint show_deleted : 1; }; diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 4d0bb6ac91..0e9a66c2ad 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -44,7 +44,7 @@ typedef struct { MailMsg base; CamelFolder *folder; - CamelOperation *cancel; + GCancellable *cancellable; GList *folder_list; } SearchResultsMsg; @@ -94,7 +94,7 @@ static MailMsgInfo search_results_setup_info = { static gint mail_shell_view_setup_search_results_folder (CamelFolder *folder, GList *folder_list, - CamelOperation *cancel) + GCancellable *cancellable) { SearchResultsMsg *msg; gint id; @@ -103,7 +103,7 @@ mail_shell_view_setup_search_results_folder (CamelFolder *folder, msg = mail_msg_new (&search_results_setup_info); msg->folder = folder; - msg->cancel = cancel; + msg->cancellable = cancellable; msg->folder_list = folder_list; id = msg->base.seq; @@ -501,7 +501,7 @@ all_accounts: } if (priv->search_account_cancel != NULL) { - camel_operation_cancel (priv->search_account_cancel); + g_cancellable_cancel (priv->search_account_cancel); g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } @@ -534,7 +534,7 @@ all_accounts: /* If we already have a search folder, reuse it. */ if (search_folder != NULL) { if (priv->search_account_cancel != NULL) { - camel_operation_cancel (priv->search_account_cancel); + g_cancellable_cancel (priv->search_account_cancel); g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } @@ -620,7 +620,7 @@ current_account: } if (priv->search_account_cancel != NULL) { - camel_operation_cancel (priv->search_account_cancel); + g_cancellable_cancel (priv->search_account_cancel); g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } @@ -653,7 +653,7 @@ current_account: /* If we already have a search folder, reuse it. */ if (search_folder != NULL) { if (priv->search_account_cancel != NULL) { - camel_operation_cancel (priv->search_account_cancel); + g_cancellable_cancel (priv->search_account_cancel); g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } |