[evolution-ews] Pass GCancellable into camel_ews_utils_sync_created_items()
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] Pass GCancellable into camel_ews_utils_sync_created_items()
- Date: Thu, 30 Aug 2012 08:59:04 +0000 (UTC)
commit f748a7ff236b56cc348d6d975771f91f09aa0aa6
Author: Milan Crha <mcrha redhat com>
Date: Thu Aug 30 10:57:42 2012 +0200
Pass GCancellable into camel_ews_utils_sync_created_items()
It does blocking calls on passed-in EEwsConnection, thus the call
can be cancelled, if needed.
src/camel/camel-ews-folder.c | 6 +++---
src/camel/camel-ews-utils.c | 9 +++++----
src/camel/camel-ews-utils.h | 3 ++-
3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index 287f9ae..2ca80f4 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -1322,7 +1322,7 @@ sync_created_items (CamelEwsFolder *ews_folder,
goto exit;
}
- camel_ews_utils_sync_created_items (ews_folder, cnc, items);
+ camel_ews_utils_sync_created_items (ews_folder, cnc, items, cancellable);
items = NULL;
if (post_item_ids)
@@ -1338,7 +1338,7 @@ sync_created_items (CamelEwsFolder *ews_folder,
goto exit;
}
- camel_ews_utils_sync_created_items (ews_folder, cnc, items);
+ camel_ews_utils_sync_created_items (ews_folder, cnc, items, cancellable);
items = NULL;
if (generic_item_ids)
@@ -1348,7 +1348,7 @@ sync_created_items (CamelEwsFolder *ews_folder,
FALSE, NULL, &items, NULL, NULL,
cancellable, &local_error);
- camel_ews_utils_sync_created_items (ews_folder, cnc, items);
+ camel_ews_utils_sync_created_items (ews_folder, cnc, items, cancellable);
if (local_error) {
camel_ews_store_maybe_disconnect (ews_store, local_error);
diff --git a/src/camel/camel-ews-utils.c b/src/camel/camel-ews-utils.c
index 4cee5d8..26d42d4 100644
--- a/src/camel/camel-ews-utils.c
+++ b/src/camel/camel-ews-utils.c
@@ -661,7 +661,8 @@ camel_ews_utils_sync_updated_items (CamelEwsFolder *ews_folder,
void
camel_ews_utils_sync_created_items (CamelEwsFolder *ews_folder,
EEwsConnection *cnc,
- GSList *items_created)
+ GSList *items_created,
+ GCancellable *cancellable)
{
CamelFolder *folder;
CamelFolderChangeInfo *ci;
@@ -733,13 +734,13 @@ camel_ews_utils_sync_created_items (CamelEwsFolder *ews_folder,
from = e_ews_item_get_from (item);
if (!from)
from = e_ews_item_get_sender (item);
- mi->info.from = form_email_string_from_mb (cnc, from, NULL);
+ mi->info.from = form_email_string_from_mb (cnc, from, cancellable);
to = e_ews_item_get_to_recipients (item);
- mi->info.to = form_recipient_list (cnc, to, NULL);
+ mi->info.to = form_recipient_list (cnc, to, cancellable);
cc = e_ews_item_get_cc_recipients (item);
- mi->info.cc = form_recipient_list (cnc, cc, NULL);
+ mi->info.cc = form_recipient_list (cnc, cc, cancellable);
e_ews_item_has_attachments (item, &has_attachments);
if (has_attachments)
diff --git a/src/camel/camel-ews-utils.h b/src/camel/camel-ews-utils.h
index dc110ce..09689e2 100644
--- a/src/camel/camel-ews-utils.h
+++ b/src/camel/camel-ews-utils.h
@@ -65,7 +65,8 @@ void camel_ews_utils_sync_deleted_items
void camel_ews_utils_sync_created_items
(CamelEwsFolder *ews_folder,
EEwsConnection *cnc,
- GSList *items_created);
+ GSList *items_created,
+ GCancellable *cancellable);
void camel_ews_utils_sync_updated_items
(CamelEwsFolder *ews_folder,
GSList *items_updated);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]