[evolution-ews] EEwsConnection: Better conform to GIO conventions.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] EEwsConnection: Better conform to GIO conventions.
- Date: Sun, 13 May 2012 14:10:20 +0000 (UTC)
commit 74953a7435ea908fc0963a07a3a758d9893321d8
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue May 8 15:32:20 2012 -0400
EEwsConnection: Better conform to GIO conventions.
Just some function prototype cleanups:
- Name synchronous functions with a "_sync" suffix.
- Remove "_start" suffix from asynchronous functions.
- Fix argument order in asynchronous functions.
.../exchange-ews-account-out-of-office.c | 12 +-
.../exchange-ews-account-setup.c | 3 +-
src/addressbook/e-book-backend-ews.c | 111 +-
src/calendar/e-cal-backend-ews.c | 299 +++--
src/camel/camel-ews-folder.c | 110 +-
src/camel/camel-ews-store.c | 53 +-
src/server/e-ews-connection.c | 1297 ++++++++++----------
src/server/e-ews-connection.h | 216 ++--
src/server/tests/test-autocompletion.c | 7 +-
src/server/tests/test-createfolder.c | 8 +-
src/server/tests/test-cuditem.c | 10 +-
src/server/tests/test-deletefolder.c | 8 +-
src/server/tests/test-get-oof-settings.c | 6 +-
src/server/tests/test-getattachment.c | 10 +-
src/server/tests/test-getdelegate.c | 8 +-
src/server/tests/test-set-oof-settings.c | 8 +-
src/server/tests/test-syncfolder.c | 27 +-
src/utils/ews-camel-common.c | 9 +-
src/utils/ews-test-finditem-query.c | 27 +-
19 files changed, 1155 insertions(+), 1074 deletions(-)
---
diff --git a/src/account-setup-eplugin/exchange-ews-account-out-of-office.c b/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
index 78b2529..b61d67d 100644
--- a/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
+++ b/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
@@ -540,9 +540,9 @@ set_oof_data_from_settings (EMConfigTargetSettings *target,
cancellable = g_cancellable_new ();
- e_ews_connection_get_oof_settings_start (cnc, EWS_PRIORITY_MEDIUM,
- get_oof_settings_cb, cancellable,
- oof_frame);
+ e_ews_connection_get_oof_settings (
+ cnc, EWS_PRIORITY_MEDIUM, cancellable,
+ get_oof_settings_cb, oof_frame);
}
static OOFSettings *
@@ -594,9 +594,9 @@ ews_set_oof_settings (EMConfigTargetSettings *target)
oof_settings = get_settings_from_data ();
- e_ews_connection_set_oof_settings (cnc, EWS_PRIORITY_MEDIUM,
- oof_settings, cancellable,
- &error);
+ e_ews_connection_set_oof_settings_sync (
+ cnc, EWS_PRIORITY_MEDIUM,
+ oof_settings, cancellable, &error);
if (error) {
g_warning ("Error While setting out of office: %s\n", error->message);
diff --git a/src/account-setup-eplugin/exchange-ews-account-setup.c b/src/account-setup-eplugin/exchange-ews-account-setup.c
index 49dd415..b2682ca 100644
--- a/src/account-setup-eplugin/exchange-ews-account-setup.c
+++ b/src/account-setup-eplugin/exchange-ews-account-setup.c
@@ -541,7 +541,8 @@ fetch_button_clicked_cb (GtkButton *button,
/* pass user name while creating connection to fetch oals */
cnc = e_ews_connection_new (oab_url, user, password, NULL, NULL, NULL);
cbdata->cancellable = cancellable;
- e_ews_connection_get_oal_list_start (cnc, ews_oal_list_ready, cancellable, cbdata);
+ e_ews_connection_get_oal_list (
+ cnc, cancellable, ews_oal_list_ready, cbdata);
g_free (password);
}
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index debe694..26eb6a4 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -991,15 +991,16 @@ e_book_backend_ews_create_contacts (EBookBackend *backend,
create_contact->contact = g_object_ref (contact);
/* pass new contact component data to the exchange server and expect response in the callback */
- e_ews_connection_create_items_start (priv->cnc,
- EWS_PRIORITY_MEDIUM, NULL,
- NULL,
- priv->folder_id,
- convert_contact_to_xml,
- contact,
- ews_create_contact_cb,
- cancellable,
- create_contact);
+ e_ews_connection_create_items (
+ priv->cnc,
+ EWS_PRIORITY_MEDIUM, NULL,
+ NULL,
+ priv->folder_id,
+ convert_contact_to_xml,
+ contact,
+ cancellable,
+ ews_create_contact_cb,
+ create_contact);
}
typedef struct {
@@ -1088,10 +1089,12 @@ e_book_backend_ews_remove_contacts (EBookBackend *backend,
remove_contact->opid = opid;
remove_contact->sl_ids = copy;
- e_ews_connection_delete_items_start (priv->cnc, EWS_PRIORITY_MEDIUM, (GSList *) id_list,
- EWS_HARD_DELETE, 0 , FALSE,
- ews_book_remove_contact_cb, cancellable,
- remove_contact);
+ e_ews_connection_delete_items (
+ priv->cnc, EWS_PRIORITY_MEDIUM, (GSList *) id_list,
+ EWS_HARD_DELETE, 0 , FALSE,
+ cancellable,
+ ews_book_remove_contact_cb,
+ remove_contact);
}
typedef struct {
@@ -1276,12 +1279,14 @@ e_book_backend_ews_modify_contacts (EBookBackend *backend,
modify_contact->opid = opid;
modify_contact->old_contact = g_object_ref (old_contact);
modify_contact->new_contact = g_object_ref (contact);
- e_ews_connection_update_items_start (priv->cnc, EWS_PRIORITY_MEDIUM,
- "AlwaysOverwrite", "SendAndSaveCopy",
- "SendToAllAndSaveCopy", priv->folder_id,
- convert_contact_to_updatexml, modify_contact,
- ews_modify_contact_cb, cancellable,
- modify_contact);
+ e_ews_connection_update_items (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ "AlwaysOverwrite", "SendAndSaveCopy",
+ "SendToAllAndSaveCopy", priv->folder_id,
+ convert_contact_to_updatexml, modify_contact,
+ cancellable,
+ ews_modify_contact_cb,
+ modify_contact);
}
static void
@@ -1379,12 +1384,13 @@ e_book_backend_ews_get_contact_list (EBookBackend *backend,
fid->id = g_strdup (priv->folder_id);
fid->is_distinguished_id = FALSE;
- e_ews_connection_find_folder_items (priv->cnc, EWS_PRIORITY_MEDIUM,
- fid, "IdOnly", NULL, NULL, query,
- EWS_FOLDER_TYPE_CONTACTS,
- &includes_last_item,
- &items, (EwsConvertQueryCallback) (e_ews_query_to_restriction),
- cancellable, &error);
+ e_ews_connection_find_folder_items_sync (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ fid, "IdOnly", NULL, NULL, query,
+ EWS_FOLDER_TYPE_CONTACTS,
+ &includes_last_item,
+ &items, (EwsConvertQueryCallback) (e_ews_query_to_restriction),
+ cancellable, &error);
/*we have got Id for items lets fetch them using getitem operation*/
ebews_fetch_items (ebews, items, FALSE, &vcard_list, cancellable, &error);
@@ -1647,7 +1653,8 @@ ews_download_full_gal (EBookBackendEws *cbews,
comp_cache_file = g_build_filename (cache_dir, full->filename, NULL);
oab_cnc = e_ews_connection_new (full_url, priv->username, priv->password, NULL, NULL, NULL);
- if (!e_ews_connection_download_oal_file (oab_cnc, comp_cache_file, NULL, NULL, cancellable, error))
+ if (!e_ews_connection_download_oal_file_sync (
+ oab_cnc, comp_cache_file, NULL, NULL, cancellable, error))
goto exit;
cache_file = g_strdup_printf ("%s-%d.oab", priv->folder_name, full->seq);
@@ -1793,7 +1800,9 @@ ebews_start_gal_sync (gpointer data)
d(printf ("Ewsgal: Fetching oal full details file \n");)
- if (!e_ews_connection_get_oal_detail (oab_cnc, priv->folder_id, "Full", &full_l, priv->cancellable, &error)) {
+ if (!e_ews_connection_get_oal_detail_sync (
+ oab_cnc, priv->folder_id, "Full", &full_l,
+ priv->cancellable, &error)) {
ret = FALSE;
goto exit;
}
@@ -2123,11 +2132,11 @@ ebews_fetch_items (EBookBackendEws *ebews,
/* TODO fetch attachments */
if (contact_item_ids)
- e_ews_connection_get_items
- (cnc, EWS_PRIORITY_MEDIUM,
- contact_item_ids, "Default", CONTACT_ITEM_PROPS,
- FALSE, NULL, &new_items, NULL, NULL,
- cancellable, error);
+ e_ews_connection_get_items_sync (
+ cnc, EWS_PRIORITY_MEDIUM,
+ contact_item_ids, "Default", CONTACT_ITEM_PROPS,
+ FALSE, NULL, &new_items, NULL, NULL,
+ cancellable, error);
if (*error)
goto cleanup;
@@ -2141,11 +2150,11 @@ ebews_fetch_items (EBookBackendEws *ebews,
/* Get the display names of the distribution lists */
if (dl_ids)
- e_ews_connection_get_items
- (cnc, EWS_PRIORITY_MEDIUM,
- dl_ids, "Default", NULL,
- FALSE, NULL, &new_items, NULL, NULL,
- cancellable, error);
+ e_ews_connection_get_items_sync (
+ cnc, EWS_PRIORITY_MEDIUM,
+ dl_ids, "Default", NULL,
+ FALSE, NULL, &new_items, NULL, NULL,
+ cancellable, error);
if (*error)
goto cleanup;
@@ -2169,7 +2178,9 @@ ebews_fetch_items (EBookBackendEws *ebews,
goto cleanup;
d_name = e_ews_item_get_subject (item);
- e_ews_connection_expand_dl (cnc, EWS_PRIORITY_MEDIUM, mb, &members, &includes_last, priv->cancellable, error);
+ e_ews_connection_expand_dl_sync (
+ cnc, EWS_PRIORITY_MEDIUM, mb, &members,
+ &includes_last, priv->cancellable, error);
if (*error)
goto cleanup;
@@ -2225,12 +2236,13 @@ ebews_start_sync (gpointer data)
GSList *items_created = NULL, *items_updated = NULL;
GSList *items_deleted = NULL;
- e_ews_connection_sync_folder_items (priv->cnc, EWS_PRIORITY_MEDIUM,
- &sync_state, priv->folder_id,
- "IdOnly", NULL,
- EWS_MAX_FETCH_COUNT, &includes_last_item,
- &items_created, &items_updated,
- &items_deleted, priv->cancellable, &error);
+ e_ews_connection_sync_folder_items_sync (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ &sync_state, priv->folder_id,
+ "IdOnly", NULL,
+ EWS_MAX_FETCH_COUNT, &includes_last_item,
+ &items_created, &items_updated,
+ &items_deleted, priv->cancellable, &error);
if (error)
break;
@@ -2462,9 +2474,10 @@ e_book_backend_ews_start_book_view (EBookBackend *backend,
* items during auto-completion. Change it if needed. TODO, Personal Address-book should start using
* find_items rather than resolve_names to support all queries */
g_hash_table_insert (priv->ops, book_view, cancellable);
- e_ews_connection_resolve_names (priv->cnc, EWS_PRIORITY_MEDIUM, auto_comp_str,
- EWS_SEARCH_AD, NULL, TRUE, &mailboxes, &contacts,
- &includes_last_item, cancellable, &error);
+ e_ews_connection_resolve_names_sync (
+ priv->cnc, EWS_PRIORITY_MEDIUM, auto_comp_str,
+ EWS_SEARCH_AD, NULL, TRUE, &mailboxes, &contacts,
+ &includes_last_item, cancellable, &error);
g_free (auto_comp_str);
g_hash_table_remove (priv->ops, book_view);
e_ews_folder_free_fid (fid);
@@ -2660,7 +2673,9 @@ e_book_backend_ews_authenticate_user (EBookBackend *backend,
fid->id = g_strdup ("contacts");
fid->is_distinguished_id = TRUE;
ids = g_slist_append (ids, fid);
- e_ews_connection_get_folder (cnc, EWS_PRIORITY_MEDIUM, "Default", NULL, ids, &folders, cancellable, &error);
+ e_ews_connection_get_folder_sync (
+ cnc, EWS_PRIORITY_MEDIUM, "Default",
+ NULL, ids, &folders, cancellable, &error);
e_ews_folder_free_fid (fid);
g_slist_free (ids);
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index c3ca3ce..8317ab7 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -364,12 +364,14 @@ e_cal_backend_ews_discard_alarm (ECalBackend *backend,
ews_cal_component_get_item_id (comp, &edad->itemid, &edad->changekey);
- e_ews_connection_update_items_start (priv->cnc, EWS_PRIORITY_MEDIUM,
- "AlwaysOverwrite", NULL,
- "SendToNone", NULL,
- clear_reminder_is_set, edad,
- ews_cal_discard_alarm_cb, priv->cancellable,
- edad);
+ e_ews_connection_update_items (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ "AlwaysOverwrite", NULL,
+ "SendToNone", NULL,
+ clear_reminder_is_set, edad,
+ priv->cancellable,
+ ews_cal_discard_alarm_cb,
+ edad);
}
static void
@@ -570,7 +572,9 @@ connect_to_server (ECalBackendEws *cbews,
fid = g_new0 (EwsFolderId, 1);
fid->id = g_strdup (priv->folder_id);
ids = g_slist_append (ids, fid);
- e_ews_connection_get_folder (cnc, EWS_PRIORITY_MEDIUM, "Default", NULL, ids, &folders, priv->cancellable, &err);
+ e_ews_connection_get_folder_sync (
+ cnc, EWS_PRIORITY_MEDIUM, "Default", NULL,
+ ids, &folders, priv->cancellable, &err);
e_ews_folder_free_fid (fid);
g_slist_free (ids);
@@ -1053,10 +1057,12 @@ e_cal_backend_ews_remove_object (ECalBackend *backend,
remove_data->rid = (rid ? g_strdup (rid) : NULL);
remove_data->mod = mod;
- e_ews_connection_delete_item_start (priv->cnc, EWS_PRIORITY_MEDIUM, &remove_data->item_id, index,
- EWS_HARD_DELETE, EWS_SEND_TO_NONE, EWS_ALL_OCCURRENCES,
- ews_cal_remove_object_cb, priv->cancellable,
- remove_data);
+ e_ews_connection_delete_item (
+ priv->cnc, EWS_PRIORITY_MEDIUM, &remove_data->item_id, index,
+ EWS_HARD_DELETE, EWS_SEND_TO_NONE, EWS_ALL_OCCURRENCES,
+ priv->cancellable,
+ ews_cal_remove_object_cb,
+ remove_data);
return;
errorlvl2:
@@ -1441,16 +1447,17 @@ ews_create_attachments_cb (GObject *object,
/*In case of appointment we have to set SendMeetingInvites to SendToNone */
send_meeting_invitations = "SendToNone";
- e_ews_connection_update_items_start (priv->cnc, EWS_PRIORITY_MEDIUM,
- "AlwaysOverwrite",
- "SendAndSaveCopy",
- send_meeting_invitations,
- priv->folder_id,
- convert_component_to_updatexml,
- modify_data,
- ews_cal_modify_object_cb,
- priv->cancellable,
- modify_data);
+ e_ews_connection_update_items (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ "AlwaysOverwrite",
+ "SendAndSaveCopy",
+ send_meeting_invitations,
+ priv->folder_id,
+ convert_component_to_updatexml,
+ modify_data,
+ priv->cancellable,
+ ews_cal_modify_object_cb,
+ modify_data);
}
g_slist_free (ids);
@@ -1501,7 +1508,8 @@ ews_create_object_cb (GObject *object,
items = g_slist_append (items, item_id->id);
/* get calender uid from server*/
- result = e_ews_connection_get_items (cnc, EWS_PRIORITY_MEDIUM,
+ result = e_ews_connection_get_items_sync (
+ cnc, EWS_PRIORITY_MEDIUM,
items,
"IdOnly",
"calendar:UID",
@@ -1544,9 +1552,12 @@ ews_create_object_cb (GObject *object,
attach_data->cb_type = 1;
e_cal_component_get_attachment_list (create_data->comp, &attachments);
- e_ews_connection_create_attachments_start (cnc, EWS_PRIORITY_MEDIUM,
- item_id, attachments,
- ews_create_attachments_cb, priv->cancellable, attach_data);
+ e_ews_connection_create_attachments (
+ cnc, EWS_PRIORITY_MEDIUM,
+ item_id, attachments,
+ priv->cancellable,
+ ews_create_attachments_cb,
+ attach_data);
for (i = attachments; i; i = i->next) g_free (i->data);
g_slist_free (attachments);
@@ -1750,16 +1761,17 @@ e_cal_backend_ews_create_objects (ECalBackend *backend,
/*In case of appointment we have to set SendMeetingInvites to SendToNone */
send_meeting_invitations = "SendToNone";
- e_ews_connection_create_items_start (priv->cnc,
- EWS_PRIORITY_MEDIUM,
- "SaveOnly",
- send_meeting_invitations,
- priv->folder_id,
- convert_calcomp_to_xml,
- convert_data,
- ews_create_object_cb,
- cancellable,
- create_data);
+ e_ews_connection_create_items (
+ priv->cnc,
+ EWS_PRIORITY_MEDIUM,
+ "SaveOnly",
+ send_meeting_invitations,
+ priv->folder_id,
+ convert_calcomp_to_xml,
+ convert_data,
+ cancellable,
+ ews_create_object_cb,
+ create_data);
return;
exit:
@@ -2271,7 +2283,9 @@ e_cal_backend_ews_modify_object (ECalBackend *backend,
icalprop = icalcomponent_get_next_property (icalcomp, ICAL_ATTACH_PROPERTY);
}
- items = e_ews_connection_delete_attachments (priv->cnc, EWS_PRIORITY_MEDIUM, removed_attachments_ids, cancellable, &error);
+ items = e_ews_connection_delete_attachments_sync (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ removed_attachments_ids, cancellable, &error);
changekey = items->data;
@@ -2301,9 +2315,12 @@ e_cal_backend_ews_modify_object (ECalBackend *backend,
e_data_cal_respond_modify_objects (cal, context, error, NULL, NULL);
}
- e_ews_connection_create_attachments_start (priv->cnc, EWS_PRIORITY_MEDIUM,
- item_id, added_attachments,
- ews_create_attachments_cb, cancellable, attach_data);
+ e_ews_connection_create_attachments (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ item_id, added_attachments,
+ cancellable,
+ ews_create_attachments_cb,
+ attach_data);
g_slist_free (added_attachments);
g_free (item_id);
@@ -2325,16 +2342,17 @@ e_cal_backend_ews_modify_object (ECalBackend *backend,
/*In case of appointment we have to set SendMeetingInvites to SendToNone */
send_meeting_invitations = "SendToNone";
- e_ews_connection_update_items_start (priv->cnc, EWS_PRIORITY_MEDIUM,
- "AlwaysOverwrite",
- "SendAndSaveCopy",
- send_meeting_invitations,
- priv->folder_id,
- convert_component_to_updatexml,
- modify_data,
- ews_cal_modify_object_cb,
- cancellable,
- modify_data);
+ e_ews_connection_update_items (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ "AlwaysOverwrite",
+ "SendAndSaveCopy",
+ send_meeting_invitations,
+ priv->folder_id,
+ convert_component_to_updatexml,
+ modify_data,
+ cancellable,
+ ews_cal_modify_object_cb,
+ modify_data);
}
return;
@@ -2394,13 +2412,11 @@ e_ews_receive_objects_no_exchange_mail (ECalBackendEwsPrivate *priv,
GError *error)
{
gchar *mime_content = e_ews_get_icalcomponent_as_mime_content (subcomp);
- e_ews_connection_create_items (priv->cnc, EWS_PRIORITY_MEDIUM,
- "SendAndSaveCopy", "SendToNone", NULL,
- prepare_create_item_with_mime_content_request,
- mime_content,
- &ids,
- cancellable,
- &error);
+ e_ews_connection_create_items_sync (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ "SendAndSaveCopy", "SendToNone", NULL,
+ prepare_create_item_with_mime_content_request,
+ mime_content, &ids, cancellable, &error);
g_free (mime_content);
/*we still have to send a mail with accept to meeting organizer*/
}
@@ -2545,12 +2561,13 @@ e_cal_backend_ews_receive_objects (ECalBackend *backend,
if (item_id == NULL)
e_ews_receive_objects_no_exchange_mail (priv, subcomp, ids, cancellable, error);
else
- e_ews_connection_create_items (priv->cnc, EWS_PRIORITY_MEDIUM,
- "SendAndSaveCopy",
- NULL, NULL,
- prepare_accept_item_request,
- accept_data,
- &ids, cancellable, &error);
+ e_ews_connection_create_items_sync (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ "SendAndSaveCopy",
+ NULL, NULL,
+ prepare_accept_item_request,
+ accept_data,
+ &ids, cancellable, &error);
if (!error) {
transp = icalcomponent_get_first_property (subcomp, ICAL_TRANSP_PROPERTY);
if (!g_strcmp0 (icalproperty_get_value_as_string (transp), "TRANSPARENT") &&
@@ -2565,16 +2582,17 @@ e_cal_backend_ews_receive_objects (ECalBackend *backend,
break;
}
}
- e_ews_connection_update_items (priv->cnc,
- EWS_PRIORITY_MEDIUM,
- "AlwaysOverwrite",
- NULL, "SendToNone",
- NULL,
- prepare_set_free_busy_status,
- accept_data,
- &ids,
- cancellable,
- &error);
+ e_ews_connection_update_items_sync (
+ priv->cnc,
+ EWS_PRIORITY_MEDIUM,
+ "AlwaysOverwrite",
+ NULL, "SendToNone",
+ NULL,
+ prepare_set_free_busy_status,
+ accept_data,
+ &ids,
+ cancellable,
+ &error);
}
}
g_free (item_id);
@@ -2947,15 +2965,17 @@ ews_get_attachments (ECalBackendEws *cbews,
att_data->itemid = g_strdup (item_id->id);
e_cal_component_get_uid (att_data->comp, &uid);
- e_ews_connection_get_attachments_start (cbews->priv->cnc,
- EWS_PRIORITY_MEDIUM,
- uid,
- attachment_ids,
- cbews->priv->storage_path,
- TRUE,
- ews_get_attachments_ready_callback,
- NULL, NULL,
- cbews->priv->cancellable, att_data);
+ e_ews_connection_get_attachments (
+ cbews->priv->cnc,
+ EWS_PRIORITY_MEDIUM,
+ uid,
+ attachment_ids,
+ cbews->priv->storage_path,
+ TRUE,
+ NULL, NULL,
+ cbews->priv->cancellable,
+ ews_get_attachments_ready_callback,
+ att_data);
}
}
@@ -3082,9 +3102,10 @@ add_item_to_cache (ECalBackendEws *cbews,
icalcomponent_add_property (icalcomp, icalprop);
/* get delegator mail box*/
- e_ews_connection_resolve_names (priv->cnc, EWS_PRIORITY_MEDIUM, task_owner,
- EWS_SEARCH_AD, NULL, FALSE, &mailboxes, NULL,
- &includes_last_item, priv->cancellable, &error);
+ e_ews_connection_resolve_names_sync (
+ priv->cnc, EWS_PRIORITY_MEDIUM, task_owner,
+ EWS_SEARCH_AD, NULL, FALSE, &mailboxes, NULL,
+ &includes_last_item, priv->cancellable, &error);
for (l = mailboxes; l != NULL; l = g_slist_next (l)) {
EwsMailbox *mb = l->data;
@@ -3352,11 +3373,13 @@ ews_cal_get_items_ready_cb (GObject *obj,
sub_sync_data->cbews = g_object_ref (sync_data->cbews);
sub_sync_data->master_uid = g_strdup (item_id->id);
- e_ews_connection_get_items_start (g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
- modified_occurrences,
- "IdOnly", "item:Attachments item:HasAttachments item:MimeContent calendar:TimeZone calendar:UID calendar:Resources calendar:ModifiedOccurrences calendar:RequiredAttendees calendar:OptionalAttendees",
- FALSE, NULL, ews_cal_get_items_ready_cb, NULL, NULL, priv->cancellable,
- (gpointer) sub_sync_data);
+ e_ews_connection_get_items (
+ g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
+ modified_occurrences,
+ "IdOnly", "item:Attachments item:HasAttachments item:MimeContent calendar:TimeZone calendar:UID calendar:Resources calendar:ModifiedOccurrences calendar:RequiredAttendees calendar:OptionalAttendees",
+ FALSE, NULL, NULL, NULL, priv->cancellable,
+ ews_cal_get_items_ready_cb,
+ (gpointer) sub_sync_data);
g_object_unref (cnc);
}
@@ -3377,13 +3400,14 @@ ews_cal_get_items_ready_cb (GObject *obj,
if (sync_data->sync_state)
e_cal_backend_store_put_key_value (priv->store, SYNC_KEY, sync_data->sync_state);
if (sync_data->sync_pending)
- e_ews_connection_sync_folder_items_start
- (g_object_ref (priv->cnc), EWS_PRIORITY_MEDIUM,
- sync_data->sync_state, priv->folder_id,
- "IdOnly", NULL,
- EWS_MAX_FETCH_COUNT,
- ews_cal_sync_items_ready_cb,
- priv->cancellable, g_object_ref (cbews));
+ e_ews_connection_sync_folder_items (
+ g_object_ref (priv->cnc), EWS_PRIORITY_MEDIUM,
+ sync_data->sync_state, priv->folder_id,
+ "IdOnly", NULL,
+ EWS_MAX_FETCH_COUNT,
+ priv->cancellable,
+ ews_cal_sync_items_ready_cb,
+ g_object_ref (cbews));
exit:
g_object_unref (sync_data->cbews);
@@ -3476,13 +3500,14 @@ ews_cal_sync_items_ready_cb (GObject *obj,
if (!cal_item_ids && !task_item_ids && !includes_last_item) {
e_cal_backend_store_put_key_value (priv->store, SYNC_KEY, sync_state);
- e_ews_connection_sync_folder_items_start
- (g_object_ref (priv->cnc), EWS_PRIORITY_MEDIUM,
- sync_state, priv->folder_id,
- "IdOnly", NULL,
- EWS_MAX_FETCH_COUNT,
- ews_cal_sync_items_ready_cb,
- priv->cancellable, g_object_ref (cbews));
+ e_ews_connection_sync_folder_items (
+ g_object_ref (priv->cnc), EWS_PRIORITY_MEDIUM,
+ sync_state, priv->folder_id,
+ "IdOnly", NULL,
+ EWS_MAX_FETCH_COUNT,
+ priv->cancellable,
+ ews_cal_sync_items_ready_cb,
+ g_object_ref (cbews));
g_free (sync_state);
goto exit;
}
@@ -3495,26 +3520,28 @@ ews_cal_sync_items_ready_cb (GObject *obj,
}
if (cal_item_ids)
- e_ews_connection_get_items_start (cnc,
- EWS_PRIORITY_MEDIUM,
- cal_item_ids,
- "IdOnly",
- "item:Attachments item:HasAttachments item:MimeContent calendar:TimeZone calendar:UID calendar:Resources calendar:ModifiedOccurrences calendar:RequiredAttendees calendar:OptionalAttendees",
- FALSE, NULL,
- ews_cal_get_items_ready_cb,
- NULL, NULL, priv->cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_items (
+ cnc,
+ EWS_PRIORITY_MEDIUM,
+ cal_item_ids,
+ "IdOnly",
+ "item:Attachments item:HasAttachments item:MimeContent calendar:TimeZone calendar:UID calendar:Resources calendar:ModifiedOccurrences calendar:RequiredAttendees calendar:OptionalAttendees",
+ FALSE, NULL,
+ NULL, NULL, priv->cancellable,
+ ews_cal_get_items_ready_cb,
+ (gpointer) sync_data);
if (task_item_ids)
- e_ews_connection_get_items_start (cnc, EWS_PRIORITY_MEDIUM,
- task_item_ids,
- "AllProperties",
- NULL,
- FALSE,
- NULL,
- ews_cal_get_items_ready_cb,
- NULL, NULL, priv->cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_items (
+ cnc, EWS_PRIORITY_MEDIUM,
+ task_item_ids,
+ "AllProperties",
+ NULL,
+ FALSE,
+ NULL,
+ NULL, NULL, priv->cancellable,
+ ews_cal_get_items_ready_cb,
+ (gpointer) sync_data);
exit:
if (cal_item_ids) {
@@ -3551,13 +3578,14 @@ ews_start_sync (gpointer data)
PRIV_UNLOCK (priv);
sync_state = e_cal_backend_store_get_key_value (priv->store, SYNC_KEY);
- e_ews_connection_sync_folder_items_start
- (priv->cnc, EWS_PRIORITY_MEDIUM,
- sync_state, priv->folder_id,
- "IdOnly", NULL,
- EWS_MAX_FETCH_COUNT,
- ews_cal_sync_items_ready_cb,
- priv->cancellable, g_object_ref (cbews));
+ e_ews_connection_sync_folder_items (
+ priv->cnc, EWS_PRIORITY_MEDIUM,
+ sync_state, priv->folder_id,
+ "IdOnly", NULL,
+ EWS_MAX_FETCH_COUNT,
+ priv->cancellable,
+ ews_cal_sync_items_ready_cb,
+ g_object_ref (cbews));
return TRUE;
}
@@ -3796,13 +3824,14 @@ e_cal_backend_ews_get_free_busy (ECalBackend *backend,
free_busy_data->end = end;
free_busy_data->timezone = priv->default_zone;
- e_ews_connection_get_free_busy_start (priv->cnc,
- EWS_PRIORITY_MEDIUM,
- prepare_free_busy_request,
- free_busy_data,
- ews_cal_get_free_busy_cb,
- cancellable,
- free_busy_data);
+ e_ews_connection_get_free_busy (
+ priv->cnc,
+ EWS_PRIORITY_MEDIUM,
+ prepare_free_busy_request,
+ free_busy_data,
+ cancellable,
+ ews_cal_get_free_busy_cb,
+ free_busy_data);
return;
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index d413132..7159281 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -440,12 +440,13 @@ camel_ews_folder_get_message (CamelFolder *folder,
goto exit;
}
- res = e_ews_connection_get_items (cnc, pri, ids, "IdOnly", "item:MimeContent",
- TRUE, mime_dir,
- &items,
- (ESoapProgressFn) camel_operation_progress,
- (gpointer) cancellable,
- cancellable, error);
+ res = e_ews_connection_get_items_sync (
+ cnc, pri, ids, "IdOnly", "item:MimeContent",
+ TRUE, mime_dir,
+ &items,
+ (ESoapProgressFn) camel_operation_progress,
+ (gpointer) cancellable,
+ cancellable, error);
g_free (mime_dir);
if (!res)
@@ -468,12 +469,14 @@ camel_ews_folder_get_message (CamelFolder *folder,
gboolean is_calendar_UID = TRUE;
// Get AssociatedCalendarItemId with second get_items call
- res = e_ews_connection_get_items (cnc, pri, ids, "IdOnly", "meeting:AssociatedCalendarItemId",
- FALSE, NULL,
- &items_req,
- (ESoapProgressFn) camel_operation_progress,
- (gpointer) cancellable,
- cancellable, error);
+ res = e_ews_connection_get_items_sync (
+ cnc, pri, ids, "IdOnly",
+ "meeting:AssociatedCalendarItemId",
+ FALSE, NULL,
+ &items_req,
+ (ESoapProgressFn) camel_operation_progress,
+ (gpointer) cancellable,
+ cancellable, error);
if (!res || (items_req && e_ews_item_get_item_type (items_req->data) == E_EWS_ITEM_TYPE_ERROR)) {
if (items_req) {
g_object_unref (items_req->data);
@@ -783,11 +786,12 @@ ews_sync_mi_flags (CamelFolder *folder,
ews_store = (CamelEwsStore *) camel_folder_get_parent_store (folder);
cnc = camel_ews_store_get_connection (ews_store);
- return e_ews_connection_update_items (cnc, EWS_PRIORITY_LOW,
- "AlwaysOverwrite", "SaveOnly",
- NULL, NULL,
- msg_update_flags, mi_list, NULL,
- cancellable, error);
+ return e_ews_connection_update_items_sync (
+ cnc, EWS_PRIORITY_LOW,
+ "AlwaysOverwrite", "SaveOnly",
+ NULL, NULL,
+ msg_update_flags, mi_list, NULL,
+ cancellable, error);
}
static gboolean
@@ -1023,8 +1027,8 @@ sync_updated_items (CamelEwsFolder *ews_folder,
g_slist_free (updated_items);
if (msg_ids)
- e_ews_connection_get_items
- (g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
+ e_ews_connection_get_items_sync (
+ g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
msg_ids, "IdOnly", SUMMARY_MESSAGE_FLAGS,
FALSE, NULL, &items, NULL, NULL,
cancellable, error);
@@ -1035,11 +1039,11 @@ sync_updated_items (CamelEwsFolder *ews_folder,
goto exit;
if (generic_item_ids)
- e_ews_connection_get_items
- (g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
- generic_item_ids, "IdOnly", SUMMARY_ITEM_FLAGS,
- FALSE, NULL, &items, NULL, NULL,
- cancellable, error);
+ e_ews_connection_get_items_sync (
+ g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
+ generic_item_ids, "IdOnly", SUMMARY_ITEM_FLAGS,
+ FALSE, NULL, &items, NULL, NULL,
+ cancellable, error);
camel_ews_utils_sync_updated_items (ews_folder, items);
exit:
@@ -1094,11 +1098,11 @@ sync_created_items (CamelEwsFolder *ews_folder,
g_slist_free (created_items);
if (msg_ids)
- e_ews_connection_get_items
- (g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
- msg_ids, "IdOnly", SUMMARY_MESSAGE_PROPS,
- FALSE, NULL, &items, NULL, NULL,
- cancellable, error);
+ e_ews_connection_get_items_sync (
+ g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
+ msg_ids, "IdOnly", SUMMARY_MESSAGE_PROPS,
+ FALSE, NULL, &items, NULL, NULL,
+ cancellable, error);
if (*error)
goto exit;
@@ -1107,11 +1111,11 @@ sync_created_items (CamelEwsFolder *ews_folder,
items = NULL;
if (post_item_ids)
- e_ews_connection_get_items
- (g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
- post_item_ids, "IdOnly", SUMMARY_POSTITEM_PROPS,
- FALSE, NULL, &items, NULL, NULL,
- cancellable, error);
+ e_ews_connection_get_items_sync (
+ g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
+ post_item_ids, "IdOnly", SUMMARY_POSTITEM_PROPS,
+ FALSE, NULL, &items, NULL, NULL,
+ cancellable, error);
if (*error)
goto exit;
@@ -1120,11 +1124,11 @@ sync_created_items (CamelEwsFolder *ews_folder,
items = NULL;
if (generic_item_ids)
- e_ews_connection_get_items
- (g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
- generic_item_ids, "IdOnly", SUMMARY_ITEM_PROPS,
- FALSE, NULL, &items, NULL, NULL,
- cancellable, error);
+ e_ews_connection_get_items_sync (
+ g_object_ref (cnc), EWS_PRIORITY_MEDIUM,
+ generic_item_ids, "IdOnly", SUMMARY_ITEM_PROPS,
+ FALSE, NULL, &items, NULL, NULL,
+ cancellable, error);
camel_ews_utils_sync_created_items (ews_folder, items);
@@ -1197,13 +1201,13 @@ ews_refresh_info_sync (CamelFolder *folder,
GSList *items_deleted = NULL;
guint32 total, unread;
- e_ews_connection_sync_folder_items
- (cnc, EWS_PRIORITY_MEDIUM,
- &sync_state, id,
- "IdOnly", NULL,
- EWS_MAX_FETCH_COUNT, &includes_last_item,
- &items_created, &items_updated,
- &items_deleted, cancellable, &rerror);
+ e_ews_connection_sync_folder_items_sync (
+ cnc, EWS_PRIORITY_MEDIUM,
+ &sync_state, id,
+ "IdOnly", NULL,
+ EWS_MAX_FETCH_COUNT, &includes_last_item,
+ &items_created, &items_updated,
+ &items_deleted, cancellable, &rerror);
if (rerror)
break;
@@ -1349,10 +1353,11 @@ ews_transfer_messages_to_sync (CamelFolder *source,
ids = g_slist_append (ids, (gchar *) uids->pdata[i]);
}
- if (e_ews_connection_move_items (cnc, EWS_PRIORITY_MEDIUM,
- dst_id, !delete_originals,
- ids, &ret_items,
- cancellable, &rerror)) {
+ if (e_ews_connection_move_items_sync (
+ cnc, EWS_PRIORITY_MEDIUM,
+ dst_id, !delete_originals,
+ ids, &ret_items,
+ cancellable, &rerror)) {
if (delete_originals) {
changes = camel_folder_change_info_new ();
for (i = 0; i < uids->len; i++) {
@@ -1409,8 +1414,9 @@ ews_delete_messages (CamelFolder *folder,
delete_type = expunge ? EWS_HARD_DELETE : EWS_MOVE_TO_DELETED_ITEMS;
camel_service_lock (CAMEL_SERVICE (ews_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
- status = e_ews_connection_delete_items (cnc, EWS_PRIORITY_MEDIUM, deleted_items, delete_type,
- EWS_SEND_TO_NONE, FALSE, cancellable, &rerror);
+ status = e_ews_connection_delete_items_sync (
+ cnc, EWS_PRIORITY_MEDIUM, deleted_items, delete_type,
+ EWS_SEND_TO_NONE, FALSE, cancellable, &rerror);
camel_service_unlock (CAMEL_SERVICE (ews_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
if (!status && rerror->code == EWS_CONNECTION_ERROR_ITEMNOTFOUND) {
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index 7a1f95d..79c969d 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -429,7 +429,7 @@ ews_authenticate_sync (CamelService *service,
if (!sync_state)
initial_setup = TRUE;
- e_ews_connection_sync_folder_hierarchy (
+ e_ews_connection_sync_folder_hierarchy_sync (
priv->cnc, EWS_PRIORITY_MEDIUM,
&sync_state, &includes_last_folder,
&folders_created, &folders_updated, &folders_deleted,
@@ -461,9 +461,10 @@ ews_authenticate_sync (CamelService *service,
}
/* fetch system folders first using getfolder operation*/
- e_ews_connection_get_folder (ews_store->priv->cnc, EWS_PRIORITY_MEDIUM, "IdOnly",
- NULL, folder_ids, &folders,
- cancellable, &folder_err);
+ e_ews_connection_get_folder_sync (
+ ews_store->priv->cnc, EWS_PRIORITY_MEDIUM, "IdOnly",
+ NULL, folder_ids, &folders,
+ cancellable, &folder_err);
if (g_slist_length (folders) && (g_slist_length (folders) != G_N_ELEMENTS (system_folder)))
d(printf("Error : not all folders are returned by getfolder operation"));
@@ -659,9 +660,10 @@ ews_refresh_finfo (CamelEwsStore *ews_store)
sync_state = camel_ews_store_summary_get_string_val (ews_store->summary, "sync_state", NULL);
- e_ews_connection_sync_folder_hierarchy_start (ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
- sync_state, ews_folder_hierarchy_ready_cb,
- NULL, g_object_ref (ews_store));
+ e_ews_connection_sync_folder_hierarchy (
+ ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
+ sync_state, NULL, ews_folder_hierarchy_ready_cb,
+ g_object_ref (ews_store));
g_free (sync_state);
return TRUE;
}
@@ -707,10 +709,11 @@ ews_get_folder_info_sync (CamelStore *store,
goto offline;
}
- if (!e_ews_connection_sync_folder_hierarchy (ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
- &sync_state, &includes_last_folder,
- &folders_created, &folders_updated,
- &folders_deleted, cancellable, error)) {
+ if (!e_ews_connection_sync_folder_hierarchy_sync (
+ ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
+ &sync_state, &includes_last_folder,
+ &folders_created, &folders_updated,
+ &folders_deleted, cancellable, error)) {
if (error)
g_warning ("Unable to fetch the folder hierarchy: %s :%d \n",
(*error)->message, (*error)->code);
@@ -762,10 +765,11 @@ ews_create_folder_sync (CamelStore *store,
}
/* Make the call */
- if (!e_ews_connection_create_folder (ews_store->priv->cnc,
- EWS_PRIORITY_MEDIUM, fid,
- FALSE, folder_name, &folder_id,
- cancellable, error)) {
+ if (!e_ews_connection_create_folder_sync (
+ ews_store->priv->cnc,
+ EWS_PRIORITY_MEDIUM, fid,
+ FALSE, folder_name, &folder_id,
+ cancellable, error)) {
g_free (fid);
return NULL;
}
@@ -817,10 +821,11 @@ ews_delete_folder_sync (CamelStore *store,
return FALSE;
}
- if (!e_ews_connection_delete_folder (ews_store->priv->cnc,
- EWS_PRIORITY_MEDIUM,
- fid, FALSE, "HardDelete",
- cancellable, error)) {
+ if (!e_ews_connection_delete_folder_sync (
+ ews_store->priv->cnc,
+ EWS_PRIORITY_MEDIUM,
+ fid, FALSE, "HardDelete",
+ cancellable, error)) {
g_free (fid);
return FALSE;
}
@@ -948,8 +953,9 @@ ews_rename_folder_sync (CamelStore *store,
rename_data->folder_id = fid;
rename_data->change_key = changekey;
- if (!e_ews_connection_update_folder (ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
- rename_folder_cb, rename_data, cancellable, error)) {
+ if (!e_ews_connection_update_folder_sync (
+ ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
+ rename_folder_cb, rename_data, cancellable, error)) {
g_free (rename_data);
goto out;
}
@@ -974,8 +980,9 @@ ews_rename_folder_sync (CamelStore *store,
goto out;
}
}
- if (!e_ews_connection_move_folder (ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
- pfid, fid, cancellable, error)) {
+ if (!e_ews_connection_move_folder_sync (
+ ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
+ pfid, fid, cancellable, error)) {
g_free (pfid);
goto out;
}
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index 870fecd..a2116e8 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -1813,10 +1813,10 @@ ews_cancel_msg (GCancellable *cancellable,
}
void
-e_ews_connection_get_oal_list_start (EEwsConnection *cnc,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_get_oal_list (EEwsConnection *cnc,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *simple;
SoupMessage *msg;
@@ -1827,9 +1827,9 @@ e_ews_connection_get_oal_list_start (EEwsConnection *cnc,
msg = e_ews_get_msg_for_url (cnc->priv->uri, NULL);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_get_oal_list_start);
+ e_ews_connection_get_oal_list);
data = g_new0 (struct _oal_req_data, 1);
data->cnc = cnc;
data->simple = simple;
@@ -1855,7 +1855,7 @@ e_ews_connection_get_oal_list_finish (EEwsConnection *cnc,
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_get_oal_list_start),
+ result, G_OBJECT (cnc), e_ews_connection_get_oal_list),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -1869,12 +1869,12 @@ e_ews_connection_get_oal_list_finish (EEwsConnection *cnc,
}
void
-e_ews_connection_get_oal_detail_start (EEwsConnection *cnc,
- const gchar *oal_id,
- const gchar *oal_element,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_get_oal_detail (EEwsConnection *cnc,
+ const gchar *oal_id,
+ const gchar *oal_element,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *simple;
SoupMessage *msg;
@@ -1885,9 +1885,9 @@ e_ews_connection_get_oal_detail_start (EEwsConnection *cnc,
msg = e_ews_get_msg_for_url (cnc->priv->uri, NULL);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_get_oal_detail_start);
+ e_ews_connection_get_oal_detail);
data = g_new0 (struct _oal_req_data, 1);
data->cnc = cnc;
data->simple = simple;
@@ -1915,7 +1915,7 @@ e_ews_connection_get_oal_detail_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_get_oal_detail_start),
+ result, G_OBJECT (cnc), e_ews_connection_get_oal_detail),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -1930,7 +1930,7 @@ e_ews_connection_get_oal_detail_finish (EEwsConnection *cnc,
}
/**
- * e_ews_connection_get_oal_detail
+ * e_ews_connection_get_oal_detail_sync:
* @cnc:
* @oal_id:
* @oal_element:
@@ -1942,12 +1942,12 @@ e_ews_connection_get_oal_detail_finish (EEwsConnection *cnc,
* Returns:
**/
gboolean
-e_ews_connection_get_oal_detail (EEwsConnection *cnc,
- const gchar *oal_id,
- const gchar *oal_element,
- GSList **elements,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_get_oal_detail_sync (EEwsConnection *cnc,
+ const gchar *oal_id,
+ const gchar *oal_element,
+ GSList **elements,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -1957,10 +1957,11 @@ e_ews_connection_get_oal_detail (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_get_oal_detail_start (cnc, oal_id, oal_element,
- ews_sync_reply_cb,
- cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_oal_detail (
+ cnc, oal_id, oal_element,
+ cancellable,
+ ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -2069,13 +2070,13 @@ ews_soup_got_chunk (SoupMessage *msg,
}
void
-e_ews_connection_download_oal_file_start (EEwsConnection *cnc,
- const gchar *cache_filename,
- GAsyncReadyCallback cb,
- EwsProgressFn progress_fn,
- gpointer progress_data,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_download_oal_file (EEwsConnection *cnc,
+ const gchar *cache_filename,
+ EwsProgressFn progress_fn,
+ gpointer progress_data,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *simple;
SoupMessage *msg;
@@ -2086,9 +2087,9 @@ e_ews_connection_download_oal_file_start (EEwsConnection *cnc,
msg = e_ews_get_msg_for_url (cnc->priv->uri, NULL);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_download_oal_file_start);
+ e_ews_connection_download_oal_file);
data = g_new0 (struct _oal_req_data, 1);
data->cnc = cnc;
data->simple = simple;
@@ -2122,7 +2123,7 @@ e_ews_connection_download_oal_file_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_download_oal_file_start),
+ result, G_OBJECT (cnc), e_ews_connection_download_oal_file),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -2134,12 +2135,12 @@ e_ews_connection_download_oal_file_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_download_oal_file (EEwsConnection *cnc,
- const gchar *cache_filename,
- EwsProgressFn progress_fn,
- gpointer progress_data,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_download_oal_file_sync (EEwsConnection *cnc,
+ const gchar *cache_filename,
+ EwsProgressFn progress_fn,
+ gpointer progress_data,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -2149,11 +2150,10 @@ e_ews_connection_download_oal_file (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_download_oal_file_start
- (cnc, cache_filename,
- ews_sync_reply_cb,
- progress_fn, progress_data,
- cancellable, sync_data);
+ e_ews_connection_download_oal_file (
+ cnc, cache_filename,
+ progress_fn, progress_data,
+ cancellable, ews_sync_reply_cb, sync_data);
e_flag_wait (sync_data->eflag);
@@ -2287,7 +2287,7 @@ ews_write_sort_order_to_msg (ESoapMessage *msg,
}
/**
- * e_ews_connection_sync_folder_items_start
+ * e_ews_connection_sync_folder_items:
* @cnc: The EWS Connection
* @pri: The priority associated with the request
* @sync_state: To sync with the previous requests
@@ -2295,21 +2295,21 @@ ews_write_sort_order_to_msg (ESoapMessage *msg,
* @default_props: Can take one of the values: IdOnly,Default or AllProperties
* @additional_props: Specify any additional properties to be fetched
* @max_entries: Maximum number of items to be returned
- * @cb: Responses are parsed and returned to this callback
* @cancellable: a GCancellable to monitor cancelled operations
+ * @callback: Responses are parsed and returned to this callback
* @user_data: user data passed to callback
**/
void
-e_ews_connection_sync_folder_items_start (EEwsConnection *cnc,
- gint pri,
- const gchar *sync_state,
- const gchar *fid,
- const gchar *default_props,
- const gchar *additional_props,
- guint max_entries,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_sync_folder_items (EEwsConnection *cnc,
+ gint pri,
+ const gchar *sync_state,
+ const gchar *fid,
+ const gchar *default_props,
+ const gchar *additional_props,
+ guint max_entries,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -2350,16 +2350,16 @@ e_ews_connection_sync_folder_items_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_sync_folder_items_start);
+ e_ews_connection_sync_folder_items);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, sync_folder_items_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -2378,7 +2378,7 @@ e_ews_connection_sync_folder_items_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_sync_folder_items_start),
+ result, G_OBJECT (cnc), e_ews_connection_sync_folder_items),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -2397,19 +2397,19 @@ e_ews_connection_sync_folder_items_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_sync_folder_items (EEwsConnection *cnc,
- gint pri,
- gchar **sync_state,
- const gchar *fid,
- const gchar *default_props,
- const gchar *additional_props,
- guint max_entries,
- gboolean *includes_last_item,
- GSList **items_created,
- GSList **items_updated,
- GSList **items_deleted,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_sync_folder_items_sync (EEwsConnection *cnc,
+ gint pri,
+ gchar **sync_state,
+ const gchar *fid,
+ const gchar *default_props,
+ const gchar *additional_props,
+ guint max_entries,
+ gboolean *includes_last_item,
+ GSList **items_created,
+ GSList **items_updated,
+ GSList **items_deleted,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -2419,11 +2419,12 @@ e_ews_connection_sync_folder_items (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_sync_folder_items_start (cnc, pri, *sync_state, fid,
- default_props, additional_props,
- max_entries,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_sync_folder_items (
+ cnc, pri, *sync_state, fid,
+ default_props, additional_props,
+ max_entries,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -2469,7 +2470,7 @@ ews_append_folder_ids_to_msg (ESoapMessage *msg,
}
/**
- * e_ews_connection_find_folder_items_start
+ * e_ews_connection_find_folder_items:
* @cnc: The EWS Connection
* @pri: The priority associated with the request
* @fid: The folder id to which the items belong
@@ -2479,23 +2480,23 @@ ews_append_folder_ids_to_msg (ESoapMessage *msg,
* @query: evo query based on which items will be fetched
* @type: type of folder
* @convert_query_cb: a callback method to convert query to ews restiction
- * @cb: Responses are parsed and returned to this callback
* @cancellable: a GCancellable to monitor cancelled operations
+ * @callback: Responses are parsed and returned to this callback
* @user_data: user data passed to callback
**/
void
-e_ews_connection_find_folder_items_start (EEwsConnection *cnc,
- gint pri,
- EwsFolderId *fid,
- const gchar *default_props,
- EwsAdditionalProps *add_props,
- EwsSortOrder *sort_order,
- const gchar *query,
- EwsFolderType type,
- EwsConvertQueryCallback convert_query_cb,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_find_folder_items (EEwsConnection *cnc,
+ gint pri,
+ EwsFolderId *fid,
+ const gchar *default_props,
+ EwsAdditionalProps *add_props,
+ EwsSortOrder *sort_order,
+ const gchar *query,
+ EwsFolderType type,
+ EwsConvertQueryCallback convert_query_cb,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -2531,16 +2532,16 @@ e_ews_connection_find_folder_items_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_find_folder_items_start);
+ e_ews_connection_find_folder_items);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, find_folder_items_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -2556,7 +2557,7 @@ e_ews_connection_find_folder_items_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_find_folder_items_start),
+ result, G_OBJECT (cnc), e_ews_connection_find_folder_items),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -2572,19 +2573,19 @@ e_ews_connection_find_folder_items_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_find_folder_items (EEwsConnection *cnc,
- gint pri,
- EwsFolderId *fid,
- const gchar *default_props,
- EwsAdditionalProps *add_props,
- EwsSortOrder *sort_order,
- const gchar *query,
- EwsFolderType type,
- gboolean *includes_last_item,
- GSList **items,
- EwsConvertQueryCallback convert_query_cb,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_find_folder_items_sync (EEwsConnection *cnc,
+ gint pri,
+ EwsFolderId *fid,
+ const gchar *default_props,
+ EwsAdditionalProps *add_props,
+ EwsSortOrder *sort_order,
+ const gchar *query,
+ EwsFolderType type,
+ gboolean *includes_last_item,
+ GSList **items,
+ EwsConvertQueryCallback convert_query_cb,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -2594,11 +2595,12 @@ e_ews_connection_find_folder_items (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_find_folder_items_start (cnc, pri, fid, default_props,
- add_props, sort_order, query,
- type, convert_query_cb,
- ews_sync_reply_cb, NULL,
- (gpointer) sync_data);
+ e_ews_connection_find_folder_items (
+ cnc, pri, fid, default_props,
+ add_props, sort_order, query,
+ type, convert_query_cb,
+ NULL, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -2615,12 +2617,12 @@ e_ews_connection_find_folder_items (EEwsConnection *cnc,
}
void
-e_ews_connection_sync_folder_hierarchy_start (EEwsConnection *cnc,
- gint pri,
- const gchar *sync_state,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_sync_folder_hierarchy (EEwsConnection *cnc,
+ gint pri,
+ const gchar *sync_state,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -2639,16 +2641,16 @@ e_ews_connection_sync_folder_hierarchy_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_sync_folder_hierarchy_start);
+ e_ews_connection_sync_folder_hierarchy);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, sync_hierarchy_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -2667,7 +2669,7 @@ e_ews_connection_sync_folder_hierarchy_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_sync_folder_hierarchy_start),
+ result, G_OBJECT (cnc), e_ews_connection_sync_folder_hierarchy),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -2686,15 +2688,15 @@ e_ews_connection_sync_folder_hierarchy_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_sync_folder_hierarchy (EEwsConnection *cnc,
- gint pri,
- gchar **sync_state,
- gboolean *includes_last_folder,
- GSList **folders_created,
- GSList **folders_updated,
- GSList **folders_deleted,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_sync_folder_hierarchy_sync (EEwsConnection *cnc,
+ gint pri,
+ gchar **sync_state,
+ gboolean *includes_last_folder,
+ GSList **folders_created,
+ GSList **folders_updated,
+ GSList **folders_deleted,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -2704,9 +2706,10 @@ e_ews_connection_sync_folder_hierarchy (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_sync_folder_hierarchy_start (cnc, pri, *sync_state,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_sync_folder_hierarchy (
+ cnc, pri, *sync_state,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -2726,18 +2729,18 @@ e_ews_connection_sync_folder_hierarchy (EEwsConnection *cnc,
}
void
-e_ews_connection_get_items_start (EEwsConnection *cnc,
- gint pri,
- const GSList *ids,
- const gchar *default_props,
- const gchar *additional_props,
- gboolean include_mime,
- const gchar *mime_directory,
- GAsyncReadyCallback cb,
- ESoapProgressFn progress_fn,
- gpointer progress_data,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_get_items (EEwsConnection *cnc,
+ gint pri,
+ const GSList *ids,
+ const gchar *default_props,
+ const gchar *additional_props,
+ gboolean include_mime,
+ const gchar *mime_directory,
+ ESoapProgressFn progress_fn,
+ gpointer progress_data,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -2793,16 +2796,16 @@ e_ews_connection_get_items_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_get_items_start);
+ e_ews_connection_get_items);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, get_items_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -2817,7 +2820,7 @@ e_ews_connection_get_items_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_get_items_start),
+ result, G_OBJECT (cnc), e_ews_connection_get_items),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -2832,18 +2835,18 @@ e_ews_connection_get_items_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_get_items (EEwsConnection *cnc,
- gint pri,
- const GSList *ids,
- const gchar *default_props,
- const gchar *additional_props,
- gboolean include_mime,
- const gchar *mime_directory,
- GSList **items,
- ESoapProgressFn progress_fn,
- gpointer progress_data,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_get_items_sync (EEwsConnection *cnc,
+ gint pri,
+ const GSList *ids,
+ const gchar *default_props,
+ const gchar *additional_props,
+ gboolean include_mime,
+ const gchar *mime_directory,
+ GSList **items,
+ ESoapProgressFn progress_fn,
+ gpointer progress_data,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -2853,12 +2856,13 @@ e_ews_connection_get_items (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_get_items_start (cnc, pri,ids, default_props,
- additional_props, include_mime,
- mime_directory, ews_sync_reply_cb,
- progress_fn, progress_data,
- cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_items (
+ cnc, pri,ids, default_props,
+ additional_props, include_mime,
+ mime_directory,
+ progress_fn, progress_data,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -2915,15 +2919,15 @@ ews_affected_tasks_to_str (EwsAffectedTaskOccurrencesType affected_tasks)
}
void
-e_ews_connection_delete_items_start (EEwsConnection *cnc,
- gint pri,
- GSList *ids,
- EwsDeleteType delete_type,
- EwsSendMeetingCancellationsType send_cancels,
- EwsAffectedTaskOccurrencesType affected_tasks,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_delete_items (EEwsConnection *cnc,
+ gint pri,
+ GSList *ids,
+ EwsDeleteType delete_type,
+ EwsSendMeetingCancellationsType send_cancels,
+ EwsAffectedTaskOccurrencesType affected_tasks,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -2953,29 +2957,29 @@ e_ews_connection_delete_items_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_delete_items_start);
+ e_ews_connection_delete_items);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, NULL, pri, cancellable, simple,
- cb == ews_sync_reply_cb);
+ callback == ews_sync_reply_cb);
}
void
-e_ews_connection_delete_item_start (EEwsConnection *cnc,
- gint pri,
- EwsId *item_id,
- guint index,
- EwsDeleteType delete_type,
- EwsSendMeetingCancellationsType send_cancels,
- EwsAffectedTaskOccurrencesType affected_tasks,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_delete_item (EEwsConnection *cnc,
+ gint pri,
+ EwsId *item_id,
+ guint index,
+ EwsDeleteType delete_type,
+ EwsSendMeetingCancellationsType send_cancels,
+ EwsAffectedTaskOccurrencesType affected_tasks,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3018,16 +3022,16 @@ e_ews_connection_delete_item_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_delete_items_start);
+ e_ews_connection_delete_items);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, NULL, pri, cancellable, simple,
- cb == ews_sync_reply_cb);
+ callback == ews_sync_reply_cb);
}
gboolean
@@ -3040,7 +3044,7 @@ e_ews_connection_delete_items_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_delete_items_start),
+ result, G_OBJECT (cnc), e_ews_connection_delete_items),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -3052,14 +3056,14 @@ e_ews_connection_delete_items_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_delete_items (EEwsConnection *cnc,
- gint pri,
- GSList *ids,
- EwsDeleteType delete_type,
- EwsSendMeetingCancellationsType send_cancels,
- EwsAffectedTaskOccurrencesType affected_tasks,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_delete_items_sync (EEwsConnection *cnc,
+ gint pri,
+ GSList *ids,
+ EwsDeleteType delete_type,
+ EwsSendMeetingCancellationsType send_cancels,
+ EwsAffectedTaskOccurrencesType affected_tasks,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3069,10 +3073,11 @@ e_ews_connection_delete_items (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_delete_items_start (cnc, pri, ids, delete_type,
- send_cancels, affected_tasks,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_delete_items (
+ cnc, pri, ids, delete_type,
+ send_cancels, affected_tasks,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -3087,15 +3092,15 @@ e_ews_connection_delete_items (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_delete_item (EEwsConnection *cnc,
- gint pri,
- EwsId *id,
- guint index,
- EwsDeleteType delete_type,
- EwsSendMeetingCancellationsType send_cancels,
- EwsAffectedTaskOccurrencesType affected_tasks,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_delete_item_sync (EEwsConnection *cnc,
+ gint pri,
+ EwsId *id,
+ guint index,
+ EwsDeleteType delete_type,
+ EwsSendMeetingCancellationsType send_cancels,
+ EwsAffectedTaskOccurrencesType affected_tasks,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3105,10 +3110,11 @@ e_ews_connection_delete_item (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_delete_item_start (cnc, pri, id, index, delete_type,
- send_cancels, affected_tasks,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_delete_item (
+ cnc, pri, id, index, delete_type,
+ send_cancels, affected_tasks,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -3123,17 +3129,17 @@ e_ews_connection_delete_item (EEwsConnection *cnc,
}
void
-e_ews_connection_update_items_start (EEwsConnection *cnc,
- gint pri,
- const gchar *conflict_res,
- const gchar *msg_disposition,
- const gchar *send_invites,
- const gchar *folder_id,
- EEwsRequestCreationCallback create_cb,
- gpointer create_user_data,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_update_items (EEwsConnection *cnc,
+ gint pri,
+ const gchar *conflict_res,
+ const gchar *msg_disposition,
+ const gchar *send_invites,
+ const gchar *folder_id,
+ EEwsRequestCreationCallback create_cb,
+ gpointer create_user_data,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3170,16 +3176,16 @@ e_ews_connection_update_items_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_update_items_start);
+ e_ews_connection_update_items);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, get_items_response_cb, pri, cancellable, simple,
- cb == ews_sync_reply_cb);
+ callback == ews_sync_reply_cb);
}
gboolean
@@ -3194,7 +3200,7 @@ e_ews_connection_update_items_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_update_items_start),
+ result, G_OBJECT (cnc), e_ews_connection_update_items),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -3215,17 +3221,17 @@ e_ews_connection_update_items_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_update_items (EEwsConnection *cnc,
- gint pri,
- const gchar *conflict_res,
- const gchar *msg_disposition,
- const gchar *send_invites,
- const gchar *folder_id,
- EEwsRequestCreationCallback create_cb,
- gpointer create_user_data,
- GSList **ids,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_update_items_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *conflict_res,
+ const gchar *msg_disposition,
+ const gchar *send_invites,
+ const gchar *folder_id,
+ EEwsRequestCreationCallback create_cb,
+ gpointer create_user_data,
+ GSList **ids,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3235,12 +3241,13 @@ e_ews_connection_update_items (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_update_items_start (cnc, pri, conflict_res,
- msg_disposition, send_invites,
- folder_id,
- create_cb, create_user_data,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_update_items (
+ cnc, pri, conflict_res,
+ msg_disposition, send_invites,
+ folder_id,
+ create_cb, create_user_data,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -3255,16 +3262,16 @@ e_ews_connection_update_items (EEwsConnection *cnc,
}
void
-e_ews_connection_create_items_start (EEwsConnection *cnc,
- gint pri,
- const gchar *msg_disposition,
- const gchar *send_invites,
- const gchar *folder_id,
- EEwsRequestCreationCallback create_cb,
- gpointer create_user_data,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_create_items (EEwsConnection *cnc,
+ gint pri,
+ const gchar *msg_disposition,
+ const gchar *send_invites,
+ const gchar *folder_id,
+ EEwsRequestCreationCallback create_cb,
+ gpointer create_user_data,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3298,16 +3305,16 @@ e_ews_connection_create_items_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg); /* CreateItem */
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_create_items_start);
+ e_ews_connection_create_items);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, get_items_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -3322,7 +3329,7 @@ e_ews_connection_create_items_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_create_items_start),
+ result, G_OBJECT (cnc), e_ews_connection_create_items),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -3336,16 +3343,16 @@ e_ews_connection_create_items_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_create_items (EEwsConnection *cnc,
- gint pri,
- const gchar *msg_disposition,
- const gchar *send_invites,
- const gchar *folder_id,
- EEwsRequestCreationCallback create_cb,
- gpointer create_user_data,
- GSList **ids,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_create_items_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *msg_disposition,
+ const gchar *send_invites,
+ const gchar *folder_id,
+ EEwsRequestCreationCallback create_cb,
+ gpointer create_user_data,
+ GSList **ids,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3355,11 +3362,12 @@ e_ews_connection_create_items (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_create_items_start (cnc, pri, msg_disposition,
- send_invites, folder_id,
- create_cb, create_user_data,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_create_items (
+ cnc, pri, msg_disposition,
+ send_invites, folder_id,
+ create_cb, create_user_data,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -3393,15 +3401,15 @@ get_search_scope_str (EwsContactsSearchScope scope)
}
void
-e_ews_connection_resolve_names_start (EEwsConnection *cnc,
- gint pri,
- const gchar *resolve_name,
- EwsContactsSearchScope scope,
- GSList *parent_folder_ids,
- gboolean fetch_contact_data,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_resolve_names (EEwsConnection *cnc,
+ gint pri,
+ const gchar *resolve_name,
+ EwsContactsSearchScope scope,
+ GSList *parent_folder_ids,
+ gboolean fetch_contact_data,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3429,16 +3437,16 @@ e_ews_connection_resolve_names_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_resolve_names_start);
+ e_ews_connection_resolve_names);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, resolve_names_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -3455,7 +3463,7 @@ e_ews_connection_resolve_names_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_resolve_names_start),
+ result, G_OBJECT (cnc), e_ews_connection_resolve_names),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -3476,17 +3484,17 @@ e_ews_connection_resolve_names_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_resolve_names (EEwsConnection *cnc,
- gint pri,
- const gchar *resolve_name,
- EwsContactsSearchScope scope,
- GSList *parent_folder_ids,
- gboolean fetch_contact_data,
- GSList **mailboxes,
- GSList **contact_items,
- gboolean *includes_last_item,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_resolve_names_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *resolve_name,
+ EwsContactsSearchScope scope,
+ GSList *parent_folder_ids,
+ gboolean fetch_contact_data,
+ GSList **mailboxes,
+ GSList **contact_items,
+ gboolean *includes_last_item,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3496,11 +3504,12 @@ e_ews_connection_resolve_names (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_resolve_names_start (cnc, pri, resolve_name,
- scope, parent_folder_ids,
- fetch_contact_data,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_resolve_names (
+ cnc, pri, resolve_name,
+ scope, parent_folder_ids,
+ fetch_contact_data,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -3516,12 +3525,12 @@ e_ews_connection_resolve_names (EEwsConnection *cnc,
}
void
-e_ews_connection_expand_dl_start (EEwsConnection *cnc,
- gint pri,
- const EwsMailbox *mb,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_expand_dl (EEwsConnection *cnc,
+ gint pri,
+ const EwsMailbox *mb,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3549,16 +3558,16 @@ e_ews_connection_expand_dl_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_expand_dl_start);
+ e_ews_connection_expand_dl);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, expand_dl_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
/* includes_last_item does not make sense as expand_dl does not support recursive
@@ -3576,7 +3585,7 @@ e_ews_connection_expand_dl_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_expand_dl_start),
+ result, G_OBJECT (cnc), e_ews_connection_expand_dl),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -3593,13 +3602,13 @@ e_ews_connection_expand_dl_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_expand_dl (EEwsConnection *cnc,
- gint pri,
- const EwsMailbox *mb,
- GSList **mailboxes,
- gboolean *includes_last_item,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_expand_dl_sync (EEwsConnection *cnc,
+ gint pri,
+ const EwsMailbox *mb,
+ GSList **mailboxes,
+ gboolean *includes_last_item,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3609,9 +3618,9 @@ e_ews_connection_expand_dl (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_expand_dl_start (cnc, pri, mb,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_expand_dl (
+ cnc, pri, mb, cancellable,
+ ews_sync_reply_cb, sync_data);
e_flag_wait (sync_data->eflag);
@@ -3626,13 +3635,13 @@ e_ews_connection_expand_dl (EEwsConnection *cnc,
}
void
-e_ews_connection_update_folder_start (EEwsConnection *cnc,
- gint pri,
- EEwsRequestCreationCallback create_cb,
- gpointer create_user_data,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_update_folder (EEwsConnection *cnc,
+ gint pri,
+ EEwsRequestCreationCallback create_cb,
+ gpointer create_user_data,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3652,16 +3661,16 @@ e_ews_connection_update_folder_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_update_folder_start);
+ e_ews_connection_update_folder);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, NULL, pri, cancellable, simple,
- cb == ews_sync_reply_cb);
+ callback == ews_sync_reply_cb);
}
gboolean
@@ -3674,7 +3683,7 @@ e_ews_connection_update_folder_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_update_folder_start),
+ result, G_OBJECT (cnc), e_ews_connection_update_folder),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -3686,12 +3695,12 @@ e_ews_connection_update_folder_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_update_folder (EEwsConnection *cnc,
- gint pri,
- EEwsRequestCreationCallback create_cb,
- gpointer create_user_data,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_update_folder_sync (EEwsConnection *cnc,
+ gint pri,
+ EEwsRequestCreationCallback create_cb,
+ gpointer create_user_data,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3701,10 +3710,10 @@ e_ews_connection_update_folder (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_update_folder_start (cnc, pri,
- create_cb, create_user_data,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_update_folder (
+ cnc, pri, create_cb, create_user_data,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -3719,13 +3728,13 @@ e_ews_connection_update_folder (EEwsConnection *cnc,
}
void
-e_ews_connection_move_folder_start (EEwsConnection *cnc,
- gint pri,
- const gchar *to_folder,
- const gchar *folder,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_move_folder (EEwsConnection *cnc,
+ gint pri,
+ const gchar *to_folder,
+ const gchar *folder,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3754,16 +3763,16 @@ e_ews_connection_move_folder_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_move_folder_start);
+ e_ews_connection_move_folder);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, NULL, pri, cancellable, simple,
- cb == ews_sync_reply_cb);
+ callback == ews_sync_reply_cb);
}
gboolean
@@ -3776,7 +3785,7 @@ e_ews_connection_move_folder_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_move_folder_start),
+ result, G_OBJECT (cnc), e_ews_connection_move_folder),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -3788,12 +3797,12 @@ e_ews_connection_move_folder_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_move_folder (EEwsConnection *cnc,
- gint pri,
- const gchar *to_folder,
- const gchar *folder,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_move_folder_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *to_folder,
+ const gchar *folder,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3803,9 +3812,10 @@ e_ews_connection_move_folder (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_move_folder_start (cnc, pri, to_folder, folder,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_move_folder (
+ cnc, pri, to_folder, folder,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -3820,14 +3830,14 @@ e_ews_connection_move_folder (EEwsConnection *cnc,
}
void
-e_ews_connection_get_folder_start (EEwsConnection *cnc,
- gint pri,
- const gchar *folder_shape,
- EwsAdditionalProps *add_props,
- GSList *folder_ids,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_get_folder (EEwsConnection *cnc,
+ gint pri,
+ const gchar *folder_shape,
+ EwsAdditionalProps *add_props,
+ GSList *folder_ids,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3853,16 +3863,16 @@ e_ews_connection_get_folder_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_get_folder_start);
+ e_ews_connection_get_folder);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, get_folder_response_cb, pri, cancellable, simple,
- cb == ews_sync_reply_cb);
+ callback == ews_sync_reply_cb);
}
@@ -3878,7 +3888,7 @@ e_ews_connection_get_folder_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_get_folder_start),
+ result, G_OBJECT (cnc), e_ews_connection_get_folder),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -3893,14 +3903,14 @@ e_ews_connection_get_folder_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_get_folder (EEwsConnection *cnc,
- gint pri,
- const gchar *folder_shape,
- EwsAdditionalProps *add_props,
- GSList *folder_ids,
- GSList **folders,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_get_folder_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *folder_shape,
+ EwsAdditionalProps *add_props,
+ GSList *folder_ids,
+ GSList **folders,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -3910,9 +3920,10 @@ e_ews_connection_get_folder (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_get_folder_start (cnc, pri, folder_shape, add_props,
- folder_ids, ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_folder (
+ cnc, pri, folder_shape, add_props,
+ folder_ids, cancellable,
+ ews_sync_reply_cb, sync_data);
e_flag_wait (sync_data->eflag);
@@ -3928,14 +3939,14 @@ e_ews_connection_get_folder (EEwsConnection *cnc,
}
void
-e_ews_connection_create_folder_start (EEwsConnection *cnc,
- gint pri,
- const gchar *parent_folder_id,
- gboolean is_distinguished_id,
- const gchar *folder_name,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_create_folder (EEwsConnection *cnc,
+ gint pri,
+ const gchar *parent_folder_id,
+ gboolean is_distinguished_id,
+ const gchar *folder_name,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -3969,15 +3980,15 @@ e_ews_connection_create_folder_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_create_folder_start);
+ e_ews_connection_create_folder);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
- ews_connection_queue_request (cnc, msg, ews_create_folder_response_cb, pri, cancellable, simple, cb == ews_sync_reply_cb);
+ ews_connection_queue_request (cnc, msg, ews_create_folder_response_cb, pri, cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -3992,7 +4003,7 @@ e_ews_connection_create_folder_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_create_folder_start),
+ result, G_OBJECT (cnc), e_ews_connection_create_folder),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -4008,14 +4019,14 @@ e_ews_connection_create_folder_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_create_folder (EEwsConnection *cnc,
- gint pri,
- const gchar *parent_folder_id,
- gboolean is_distinguished_id,
- const gchar *folder_name,
- EwsFolderId **folder_id,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_create_folder_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *parent_folder_id,
+ gboolean is_distinguished_id,
+ const gchar *folder_name,
+ EwsFolderId **folder_id,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -4025,12 +4036,13 @@ e_ews_connection_create_folder (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_create_folder_start (cnc, pri, parent_folder_id,
- is_distinguished_id,
- folder_name,
- ews_sync_reply_cb,
- cancellable,
- (gpointer) sync_data);
+ e_ews_connection_create_folder (
+ cnc, pri, parent_folder_id,
+ is_distinguished_id,
+ folder_name,
+ cancellable,
+ ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -4047,14 +4059,14 @@ e_ews_connection_create_folder (EEwsConnection *cnc,
}
void
-e_ews_connection_move_items_start (EEwsConnection *cnc,
- gint pri,
- const gchar *folder_id,
- gboolean docopy,
- GSList *ids,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_move_items (EEwsConnection *cnc,
+ gint pri,
+ const gchar *folder_id,
+ gboolean docopy,
+ GSList *ids,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -4084,16 +4096,16 @@ e_ews_connection_move_items_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_move_items_start);
+ e_ews_connection_move_items);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, get_items_response_cb, pri, cancellable, simple,
- cb == ews_sync_reply_cb);
+ callback == ews_sync_reply_cb);
}
gboolean
@@ -4108,7 +4120,7 @@ e_ews_connection_move_items_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_move_items_start),
+ result, G_OBJECT (cnc), e_ews_connection_move_items),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -4123,14 +4135,14 @@ e_ews_connection_move_items_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_move_items (EEwsConnection *cnc,
- gint pri,
- const gchar *folder_id,
- gboolean docopy,
- GSList *ids,
- GSList **items,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_move_items_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *folder_id,
+ gboolean docopy,
+ GSList *ids,
+ GSList **items,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -4140,9 +4152,10 @@ e_ews_connection_move_items (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_move_items_start (cnc, pri, folder_id, docopy, ids,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_move_items (
+ cnc, pri, folder_id, docopy, ids,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -4157,25 +4170,25 @@ e_ews_connection_move_items (EEwsConnection *cnc,
}
/**
- * e_ews_connection_delete_folder_start
+ * e_ews_connection_delete_folder:
* @cnc:
* @pri:
* @folder_id: folder to be deleted
* @is_distinguished_id:
* @delete_type: "HardDelete", "SoftDelete", "MoveToDeletedItems"
- * @cb:
* @cancellable:
+ * @callback:
* @user_data:
**/
void
-e_ews_connection_delete_folder_start (EEwsConnection *cnc,
- gint pri,
- const gchar *folder_id,
- gboolean is_distinguished_id,
- const gchar *delete_type,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_delete_folder (EEwsConnection *cnc,
+ gint pri,
+ const gchar *folder_id,
+ gboolean is_distinguished_id,
+ const gchar *delete_type,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -4201,15 +4214,15 @@ e_ews_connection_delete_folder_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_delete_folder_start);
+ e_ews_connection_delete_folder);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
- ews_connection_queue_request (cnc, msg, NULL, pri, cancellable, simple, cb == ews_sync_reply_cb);
+ ews_connection_queue_request (cnc, msg, NULL, pri, cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -4222,7 +4235,7 @@ e_ews_connection_delete_folder_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_delete_folder_start),
+ result, G_OBJECT (cnc), e_ews_connection_delete_folder),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -4234,7 +4247,7 @@ e_ews_connection_delete_folder_finish (EEwsConnection *cnc,
}
/**
- * e_ews_connection_delete_folder
+ * e_ews_connection_delete_folder_sync:
* @cnc:
* @pri:
* @folder_id: folder to be deleted
@@ -4244,13 +4257,13 @@ e_ews_connection_delete_folder_finish (EEwsConnection *cnc,
* @error:
**/
gboolean
-e_ews_connection_delete_folder (EEwsConnection *cnc,
- gint pri,
- const gchar *folder_id,
- gboolean is_distinguished_id,
- const gchar *delete_type,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_delete_folder_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *folder_id,
+ gboolean is_distinguished_id,
+ const gchar *delete_type,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -4260,12 +4273,13 @@ e_ews_connection_delete_folder (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_delete_folder_start (cnc, pri, folder_id,
- is_distinguished_id,
- delete_type,
- ews_sync_reply_cb,
- cancellable,
- (gpointer) sync_data);
+ e_ews_connection_delete_folder (
+ cnc, pri, folder_id,
+ is_distinguished_id,
+ delete_type,
+ cancellable,
+ ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -4363,13 +4377,13 @@ e_ews_connection_attach_file (ESoapMessage *msg,
}
void
-e_ews_connection_create_attachments_start (EEwsConnection *cnc,
- gint pri,
- const EwsId *parent,
- const GSList *files,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_create_attachments (EEwsConnection *cnc,
+ gint pri,
+ const EwsId *parent,
+ const GSList *files,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -4397,16 +4411,16 @@ e_ews_connection_create_attachments_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_create_attachments_start);
+ e_ews_connection_create_attachments);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, create_attachments_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
GSList *
@@ -4422,7 +4436,7 @@ e_ews_connection_create_attachments_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, NULL);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_create_attachments_start),
+ result, G_OBJECT (cnc), e_ews_connection_create_attachments),
NULL);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -4438,13 +4452,13 @@ e_ews_connection_create_attachments_finish (EEwsConnection *cnc,
}
GSList *
-e_ews_connection_create_attachments (EEwsConnection *cnc,
- gint pri,
- const EwsId *parent,
- const GSList *files,
- gchar **change_key,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_create_attachments_sync (EEwsConnection *cnc,
+ gint pri,
+ const EwsId *parent,
+ const GSList *files,
+ gchar **change_key,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
GSList *ids;
@@ -4454,12 +4468,13 @@ e_ews_connection_create_attachments (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_create_attachments_start (cnc, pri,
- parent,
- files,
- ews_sync_reply_cb,
- cancellable,
- (gpointer) sync_data);
+ e_ews_connection_create_attachments (
+ cnc, pri,
+ parent,
+ files,
+ cancellable,
+ ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -4497,12 +4512,12 @@ delete_attachments_response_cb (ESoapParameter *subparam,
}
void
-e_ews_connection_delete_attachments_start (EEwsConnection *cnc,
- gint pri,
- const GSList *ids,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_delete_attachments (EEwsConnection *cnc,
+ gint pri,
+ const GSList *ids,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -4525,16 +4540,16 @@ e_ews_connection_delete_attachments_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_delete_attachments_start);
+ e_ews_connection_delete_attachments);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, delete_attachments_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
GSList *
@@ -4549,7 +4564,7 @@ e_ews_connection_delete_attachments_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, NULL);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_delete_attachments_start),
+ result, G_OBJECT (cnc), e_ews_connection_delete_attachments),
NULL);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -4564,11 +4579,11 @@ e_ews_connection_delete_attachments_finish (EEwsConnection *cnc,
}
GSList *
-e_ews_connection_delete_attachments (EEwsConnection *cnc,
- gint pri,
- const GSList *ids,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_delete_attachments_sync (EEwsConnection *cnc,
+ gint pri,
+ const GSList *ids,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
GSList *parents;
@@ -4578,11 +4593,12 @@ e_ews_connection_delete_attachments (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_delete_attachments_start (cnc, pri,
- ids,
- ews_sync_reply_cb,
- cancellable,
- (gpointer) sync_data);
+ e_ews_connection_delete_attachments (
+ cnc, pri,
+ ids,
+ cancellable,
+ ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -4599,17 +4615,17 @@ e_ews_connection_delete_attachments (EEwsConnection *cnc,
static void get_attachments_response_cb (ESoapParameter *subparam, EwsNode *enode, GError **error);
void
-e_ews_connection_get_attachments_start (EEwsConnection *cnc,
- gint pri,
- const gchar *uid,
- const GSList *ids,
- const gchar *cache,
- gboolean include_mime,
- GAsyncReadyCallback cb,
- ESoapProgressFn progress_fn,
- gpointer progress_data,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_get_attachments (EEwsConnection *cnc,
+ gint pri,
+ const gchar *uid,
+ const GSList *ids,
+ const gchar *cache,
+ gboolean include_mime,
+ ESoapProgressFn progress_fn,
+ gpointer progress_data,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -4643,9 +4659,9 @@ e_ews_connection_get_attachments_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_get_attachments_start);
+ e_ews_connection_get_attachments);
async_data = g_new0 (EwsAsyncData, 1);
async_data->directory = cache;
@@ -4654,7 +4670,7 @@ e_ews_connection_get_attachments_start (EEwsConnection *cnc,
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, get_attachments_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
GSList *
@@ -4669,7 +4685,7 @@ e_ews_connection_get_attachments_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, NULL);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_get_attachments_start),
+ result, G_OBJECT (cnc), e_ews_connection_get_attachments),
NULL);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -4684,17 +4700,17 @@ e_ews_connection_get_attachments_finish (EEwsConnection *cnc,
}
GSList *
-e_ews_connection_get_attachments (EEwsConnection *cnc,
- gint pri,
- const gchar *uid,
- GSList *ids,
- const gchar *cache,
- gboolean include_mime,
- GSList **items,
- ESoapProgressFn progress_fn,
- gpointer progress_data,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_get_attachments_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *uid,
+ GSList *ids,
+ const gchar *cache,
+ gboolean include_mime,
+ GSList **items,
+ ESoapProgressFn progress_fn,
+ gpointer progress_data,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
GSList *attachments_ids;
@@ -4704,11 +4720,12 @@ e_ews_connection_get_attachments (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_get_attachments_start (cnc,pri,uid,ids,cache,include_mime,
- ews_sync_reply_cb,
- progress_fn, progress_data,
- cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_attachments (
+ cnc, pri, uid, ids, cache, include_mime,
+ progress_fn, progress_data,
+ cancellable,
+ ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -4851,13 +4868,13 @@ get_free_busy_response_cb (ESoapParameter *param,
}
void
-e_ews_connection_get_free_busy_start (EEwsConnection *cnc,
- gint pri,
- EEwsRequestCreationCallback free_busy_cb,
- gpointer free_busy_user_data,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_get_free_busy (EEwsConnection *cnc,
+ gint pri,
+ EEwsRequestCreationCallback free_busy_cb,
+ gpointer free_busy_user_data,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -4873,16 +4890,16 @@ e_ews_connection_get_free_busy_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg); /*GetUserAvailabilityRequest */
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_get_free_busy_start);
+ e_ews_connection_get_free_busy);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, get_free_busy_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -4897,7 +4914,7 @@ e_ews_connection_get_free_busy_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_get_free_busy_start),
+ result, G_OBJECT (cnc), e_ews_connection_get_free_busy),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -4911,13 +4928,13 @@ e_ews_connection_get_free_busy_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_get_free_busy (EEwsConnection *cnc,
- gint pri,
- EEwsRequestCreationCallback free_busy_cb,
- gpointer free_busy_user_data,
- GSList **free_busy,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_get_free_busy_sync (EEwsConnection *cnc,
+ gint pri,
+ EEwsRequestCreationCallback free_busy_cb,
+ gpointer free_busy_user_data,
+ GSList **free_busy,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -4927,10 +4944,11 @@ e_ews_connection_get_free_busy (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_get_free_busy_start (cnc, pri,
- free_busy_cb, free_busy_user_data,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_free_busy (
+ cnc, pri,
+ free_busy_cb, free_busy_user_data,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -5038,24 +5056,24 @@ get_delegate_response_cb (ESoapParameter *param,
}
/**
- * e_ews_connection_get_delegate_start
+ * e_ews_connection_get_delegate:
* @cnc:
* @pri:
* @mail_id: mail is for which delegate is requested
* @include permission: "true", "false"
* @delete_type: "HardDelete", "SoftDelete", "MoveToDeletedItems"
- * @cb:
* @cancellable:
+ * @callback:
* @user_data:
**/
void
-e_ews_connection_get_delegate_start (EEwsConnection *cnc,
- gint pri,
- const gchar *mail_id,
- const gchar *include_permissions,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_get_delegate (EEwsConnection *cnc,
+ gint pri,
+ const gchar *mail_id,
+ const gchar *include_permissions,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -5074,15 +5092,15 @@ e_ews_connection_get_delegate_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb,
+ callback,
user_data,
- e_ews_connection_get_delegate_start);
+ e_ews_connection_get_delegate);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
- ews_connection_queue_request (cnc, msg, get_delegate_response_cb, pri, cancellable, simple, cb == ews_sync_reply_cb);
+ ews_connection_queue_request (cnc, msg, get_delegate_response_cb, pri, cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -5097,7 +5115,7 @@ e_ews_connection_get_delegate_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_get_delegate_start),
+ result, G_OBJECT (cnc), e_ews_connection_get_delegate),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -5112,7 +5130,7 @@ e_ews_connection_get_delegate_finish (EEwsConnection *cnc,
}
/**
- * e_ews_connection_get_delegate
+ * e_ews_connection_get_delegate:
* @cnc:
* @pri:
* @mail_id: mail id for which delegate requested
@@ -5121,13 +5139,13 @@ e_ews_connection_get_delegate_finish (EEwsConnection *cnc,
* @error:
**/
gboolean
-e_ews_connection_get_delegate (EEwsConnection *cnc,
- gint pri,
- const gchar *mail_id,
- const gchar *include_permissions,
- EwsDelegateInfo **get_delegate,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_get_delegate_sync (EEwsConnection *cnc,
+ gint pri,
+ const gchar *mail_id,
+ const gchar *include_permissions,
+ EwsDelegateInfo **get_delegate,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -5137,11 +5155,12 @@ e_ews_connection_get_delegate (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_get_delegate_start (cnc, pri, mail_id,
- include_permissions,
- ews_sync_reply_cb,
- cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_delegate (
+ cnc, pri, mail_id,
+ include_permissions,
+ cancellable,
+ ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -5157,19 +5176,19 @@ e_ews_connection_get_delegate (EEwsConnection *cnc,
}
/**
- * e_ews_connection__get_oof_settings_start
+ * e_ews_connection__get_oof_settings:
* @cnc: The EWS Connection
* @pri: The priority associated with the request
- * @cb: Responses are parsed and returned to this callback
* @cancellable: a GCancellable to monitor cancelled operations
+ * @callback: Responses are parsed and returned to this callback
* @user_data: user data passed to callback
**/
void
-e_ews_connection_get_oof_settings_start (EEwsConnection *cnc,
- gint pri,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_get_oof_settings (EEwsConnection *cnc,
+ gint pri,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -5187,15 +5206,15 @@ e_ews_connection_get_oof_settings_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb, user_data,
- e_ews_connection_get_oof_settings_start);
+ callback, user_data,
+ e_ews_connection_get_oof_settings);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, get_oof_settings_response_cb, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
}
gboolean
@@ -5210,7 +5229,7 @@ e_ews_connection_get_oof_settings_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_get_oof_settings_start),
+ result, G_OBJECT (cnc), e_ews_connection_get_oof_settings),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -5225,11 +5244,11 @@ e_ews_connection_get_oof_settings_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_get_oof_settings (EEwsConnection *cnc,
- gint pri,
- OOFSettings **oof_settings,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_get_oof_settings_sync (EEwsConnection *cnc,
+ gint pri,
+ OOFSettings **oof_settings,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -5239,9 +5258,10 @@ e_ews_connection_get_oof_settings (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_get_oof_settings_start (cnc, pri,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_get_oof_settings (
+ cnc, pri,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
@@ -5256,21 +5276,21 @@ e_ews_connection_get_oof_settings (EEwsConnection *cnc,
}
/**
- * e_ews_connection__set_oof_settings_start
+ * e_ews_connection__set_oof_settings:
* @cnc: The EWS Connection
* @pri: The priority associated with the request
* @oof_settings: Details to set for ooof
- * @cb: Responses are parsed and returned to this callback
* @cancellable: a GCancellable to monitor cancelled operations
+ * @callback: Responses are parsed and returned to this callback
* @user_data: user data passed to callback
**/
void
-e_ews_connection_set_oof_settings_start (EEwsConnection *cnc,
- gint pri,
- OOFSettings *oof_settings,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data)
+e_ews_connection_set_oof_settings (EEwsConnection *cnc,
+ gint pri,
+ OOFSettings *oof_settings,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
ESoapMessage *msg;
GSimpleAsyncResult *simple;
@@ -5318,15 +5338,15 @@ e_ews_connection_set_oof_settings_start (EEwsConnection *cnc,
e_ews_message_write_footer (msg);
simple = g_simple_async_result_new (G_OBJECT (cnc),
- cb, user_data,
- e_ews_connection_set_oof_settings_start);
+ callback, user_data,
+ e_ews_connection_set_oof_settings);
async_data = g_new0 (EwsAsyncData, 1);
g_simple_async_result_set_op_res_gpointer (
simple, async_data, (GDestroyNotify) async_data_free);
ews_connection_queue_request (cnc, msg, NULL, pri,
- cancellable, simple, cb == ews_sync_reply_cb);
+ cancellable, simple, callback == ews_sync_reply_cb);
g_free (time_val);
g_free (start_tm);
@@ -5344,7 +5364,7 @@ e_ews_connection_set_oof_settings_finish (EEwsConnection *cnc,
g_return_val_if_fail (cnc != NULL, FALSE);
g_return_val_if_fail (
g_simple_async_result_is_valid (
- result, G_OBJECT (cnc), e_ews_connection_set_oof_settings_start),
+ result, G_OBJECT (cnc), e_ews_connection_set_oof_settings),
FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -5357,11 +5377,11 @@ e_ews_connection_set_oof_settings_finish (EEwsConnection *cnc,
}
gboolean
-e_ews_connection_set_oof_settings (EEwsConnection *cnc,
- gint pri,
- OOFSettings *oof_settings,
- GCancellable *cancellable,
- GError **error)
+e_ews_connection_set_oof_settings_sync (EEwsConnection *cnc,
+ gint pri,
+ OOFSettings *oof_settings,
+ GCancellable *cancellable,
+ GError **error)
{
EwsSyncData *sync_data;
gboolean result;
@@ -5371,9 +5391,10 @@ e_ews_connection_set_oof_settings (EEwsConnection *cnc,
sync_data = g_new0 (EwsSyncData, 1);
sync_data->eflag = e_flag_new ();
- e_ews_connection_set_oof_settings_start (cnc, pri, oof_settings,
- ews_sync_reply_cb, cancellable,
- (gpointer) sync_data);
+ e_ews_connection_set_oof_settings (
+ cnc, pri, oof_settings,
+ cancellable, ews_sync_reply_cb,
+ sync_data);
e_flag_wait (sync_data->eflag);
diff --git a/src/server/e-ews-connection.h b/src/server/e-ews-connection.h
index 3d3179e..a7d7eb2 100644
--- a/src/server/e-ews-connection.h
+++ b/src/server/e-ews-connection.h
@@ -195,7 +195,7 @@ void e_ews_connection_authenticate (EEwsConnection *cnc,
GError *error);
typedef void (*EEwsAutoDiscoverCallback) (EwsUrls *urls, gpointer user_data, GError *error);
-void e_ews_autodiscover_ws_url (EEwsAutoDiscoverCallback cb,
+void e_ews_autodiscover_ws_url (EEwsAutoDiscoverCallback callback,
gpointer cbdata,
const gchar *email,
const gchar *password,
@@ -206,7 +206,7 @@ void e_ews_connection_set_mailbox (EEwsConnection *cnc,
void ews_user_id_free (EwsUserId *id);
-void e_ews_connection_sync_folder_items_start
+void e_ews_connection_sync_folder_items
(EEwsConnection *cnc,
gint pri,
const gchar *sync_state,
@@ -214,8 +214,8 @@ void e_ews_connection_sync_folder_items_start
const gchar *default_props,
const gchar *additional_props,
guint max_entries,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_sync_folder_items_finish
(EEwsConnection *cnc,
@@ -226,7 +226,7 @@ gboolean e_ews_connection_sync_folder_items_finish
GSList **items_updated,
GSList **items_deleted,
GError **error);
-gboolean e_ews_connection_sync_folder_items
+gboolean e_ews_connection_sync_folder_items_sync
(EEwsConnection *cnc,
gint pri,
gchar **sync_state,
@@ -245,7 +245,7 @@ typedef void (*EwsConvertQueryCallback) (ESoapMessage *msg,
const gchar *query,
EwsFolderType type);
-void e_ews_connection_find_folder_items_start
+void e_ews_connection_find_folder_items
(EEwsConnection *cnc,
gint pri,
EwsFolderId *fid,
@@ -255,8 +255,8 @@ void e_ews_connection_find_folder_items_start
const gchar *query,
EwsFolderType type,
EwsConvertQueryCallback convert_query_cb,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_find_folder_items_finish
(EEwsConnection *cnc,
@@ -264,7 +264,7 @@ gboolean e_ews_connection_find_folder_items_finish
gboolean *includes_last_item,
GSList **items,
GError **error);
-gboolean e_ews_connection_find_folder_items
+gboolean e_ews_connection_find_folder_items_sync
(EEwsConnection *cnc,
gint pri,
EwsFolderId *fid,
@@ -279,25 +279,24 @@ gboolean e_ews_connection_find_folder_items
GCancellable *cancellable,
GError **error);
-void e_ews_connection_get_items_start
- (EEwsConnection *cnc,
+void e_ews_connection_get_items (EEwsConnection *cnc,
gint pri,
const GSList *ids,
const gchar *default_props,
const gchar *additional_props,
gboolean include_mime,
const gchar *mime_directory,
- GAsyncReadyCallback cb,
ESoapProgressFn progress_fn,
gpointer progress_data,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_get_items_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **items,
GError **error);
-gboolean e_ews_connection_get_items (EEwsConnection *cnc,
+gboolean e_ews_connection_get_items_sync (EEwsConnection *cnc,
gint pri,
const GSList *ids,
const gchar *default_props,
@@ -310,43 +309,41 @@ gboolean e_ews_connection_get_items (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_delete_items_start
- (EEwsConnection *cnc,
+void e_ews_connection_delete_items (EEwsConnection *cnc,
gint pri,
GSList *ids,
EwsDeleteType delete_type,
EwsSendMeetingCancellationsType send_cancels,
EwsAffectedTaskOccurrencesType affected_tasks,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
-void e_ews_connection_delete_item_start
+gboolean e_ews_connection_delete_items_finish
+ (EEwsConnection *cnc,
+ GAsyncResult *result,
+ GError **error);
+gboolean e_ews_connection_delete_items_sync
(EEwsConnection *cnc,
gint pri,
- EwsId *id,
- guint index,
+ GSList *ids,
EwsDeleteType delete_type,
EwsSendMeetingCancellationsType send_cancels,
EwsAffectedTaskOccurrencesType affected_tasks,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
- gpointer user_data);
-
-gboolean e_ews_connection_delete_items_finish
- (EEwsConnection *cnc,
- GAsyncResult *result,
GError **error);
-gboolean e_ews_connection_delete_items (EEwsConnection *cnc,
+void e_ews_connection_delete_item (EEwsConnection *cnc,
gint pri,
- GSList *ids,
+ EwsId *id,
+ guint index,
EwsDeleteType delete_type,
EwsSendMeetingCancellationsType send_cancels,
EwsAffectedTaskOccurrencesType affected_tasks,
GCancellable *cancellable,
- GError **error);
-
-gboolean e_ews_connection_delete_item (EEwsConnection *cnc,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean e_ews_connection_delete_item_sync
+ (EEwsConnection *cnc,
gint pri,
EwsId *id,
guint index,
@@ -356,8 +353,7 @@ gboolean e_ews_connection_delete_item (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_update_items_start
- (EEwsConnection *cnc,
+void e_ews_connection_update_items (EEwsConnection *cnc,
gint pri,
const gchar *conflict_res,
const gchar *msg_disposition,
@@ -365,15 +361,16 @@ void e_ews_connection_update_items_start
const gchar *folder_id,
EEwsRequestCreationCallback create_cb,
gpointer create_user_data,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_update_items_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **ids,
GError **error);
-gboolean e_ews_connection_update_items (EEwsConnection *cnc,
+gboolean e_ews_connection_update_items_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *conflict_res,
const gchar *msg_disposition,
@@ -385,23 +382,23 @@ gboolean e_ews_connection_update_items (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_create_items_start
- (EEwsConnection *cnc,
+void e_ews_connection_create_items (EEwsConnection *cnc,
gint pri,
const gchar *msg_disposition,
const gchar *send_invites,
const gchar *folder_id,
EEwsRequestCreationCallback create_cb,
gpointer create_user_data,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_create_items_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **ids,
GError **error);
-gboolean e_ews_connection_create_items (EEwsConnection *cnc,
+gboolean e_ews_connection_create_items_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *msg_disposition,
const gchar *send_invites,
@@ -412,42 +409,41 @@ gboolean e_ews_connection_create_items (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-gboolean e_ews_connection_sync_folder_hierarchy
+void e_ews_connection_sync_folder_hierarchy
(EEwsConnection *cnc,
gint pri,
+ const gchar *sync_state,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean e_ews_connection_sync_folder_hierarchy_finish
+ (EEwsConnection *cnc,
+ GAsyncResult *result,
gchar **sync_state,
gboolean *includes_last_folder,
GSList **folders_created,
GSList **folders_updated,
GSList **folders_deleted,
- GCancellable *cancellable,
GError **error);
-void e_ews_connection_sync_folder_hierarchy_start
+gboolean e_ews_connection_sync_folder_hierarchy_sync
(EEwsConnection *cnc,
gint pri,
- const gchar *sync_state,
- GAsyncReadyCallback cb,
- GCancellable *cancellable,
- gpointer user_data);
-gboolean e_ews_connection_sync_folder_hierarchy_finish
- (EEwsConnection *cnc,
- GAsyncResult *result,
gchar **sync_state,
gboolean *includes_last_folder,
GSList **folders_created,
GSList **folders_updated,
GSList **folders_deleted,
+ GCancellable *cancellable,
GError **error);
-void e_ews_connection_resolve_names_start
- (EEwsConnection *cnc,
+void e_ews_connection_resolve_names (EEwsConnection *cnc,
gint pri,
const gchar *resolve_name,
EwsContactsSearchScope scope,
GSList *parent_folder_ids,
gboolean fetch_contact_data,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_resolve_names_finish
(EEwsConnection *cnc,
@@ -456,7 +452,8 @@ gboolean e_ews_connection_resolve_names_finish
GSList **contact_items,
gboolean *includes_last_item,
GError **error);
-gboolean e_ews_connection_resolve_names (EEwsConnection *cnc,
+gboolean e_ews_connection_resolve_names_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *resolve_name,
EwsContactsSearchScope scope,
@@ -468,12 +465,11 @@ gboolean e_ews_connection_resolve_names (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_expand_dl_start
- (EEwsConnection *cnc,
+void e_ews_connection_expand_dl (EEwsConnection *cnc,
gint pri,
const EwsMailbox *mb,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_expand_dl_finish
(EEwsConnection *cnc,
@@ -481,7 +477,7 @@ gboolean e_ews_connection_expand_dl_finish
GSList **mailboxes,
gboolean *includes_last_item,
GError **error);
-gboolean e_ews_connection_expand_dl (EEwsConnection *cnc,
+gboolean e_ews_connection_expand_dl_sync (EEwsConnection *cnc,
gint pri,
const EwsMailbox *mb,
GSList **mailboxes,
@@ -489,21 +485,21 @@ gboolean e_ews_connection_expand_dl (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_create_folder_start
- (EEwsConnection *cnc,
+void e_ews_connection_create_folder (EEwsConnection *cnc,
gint pri,
const gchar *parent_folder_id,
gboolean is_distinguished_id,
const gchar *folder_name,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_create_folder_finish
(EEwsConnection *cnc,
GAsyncResult *result,
EwsFolderId **folder_id,
GError **error);
-gboolean e_ews_connection_create_folder (EEwsConnection *cnc,
+gboolean e_ews_connection_create_folder_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *parent_folder_id,
gboolean is_distinguished_id,
@@ -512,20 +508,20 @@ gboolean e_ews_connection_create_folder (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_delete_folder_start
- (EEwsConnection *cnc,
+void e_ews_connection_delete_folder (EEwsConnection *cnc,
gint pri,
const gchar *folder_id,
gboolean is_distinguished_id,
const gchar *delete_type,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_delete_folder_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GError **error);
-gboolean e_ews_connection_delete_folder (EEwsConnection *cnc,
+gboolean e_ews_connection_delete_folder_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *folder_id,
gboolean is_distinguished_id,
@@ -533,59 +529,59 @@ gboolean e_ews_connection_delete_folder (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_update_folder_start
- (EEwsConnection *cnc,
+void e_ews_connection_update_folder (EEwsConnection *cnc,
gint pri,
EEwsRequestCreationCallback create_cb,
gpointer create_user_data,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_update_folder_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GError **error);
-gboolean e_ews_connection_update_folder (EEwsConnection *cnc,
+gboolean e_ews_connection_update_folder_sync
+ (EEwsConnection *cnc,
gint pri,
EEwsRequestCreationCallback create_cb,
gpointer create_user_data,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_move_folder_start
- (EEwsConnection *cnc,
+void e_ews_connection_move_folder (EEwsConnection *cnc,
gint pri,
const gchar *to_folder,
const gchar *folder,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_move_folder_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GError **error);
-gboolean e_ews_connection_move_folder (EEwsConnection *cnc,
+gboolean e_ews_connection_move_folder_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *to_folder,
const gchar *folder,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_get_folder_start
- (EEwsConnection *cnc,
+void e_ews_connection_get_folder (EEwsConnection *cnc,
gint pri,
const gchar *folder_shape,
EwsAdditionalProps *add_props,
GSList *folder_ids,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_get_folder_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **folders,
GError **error);
-gboolean e_ews_connection_get_folder (EEwsConnection *cnc,
+gboolean e_ews_connection_get_folder_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *folder_shape,
EwsAdditionalProps *add_props,
@@ -594,21 +590,21 @@ gboolean e_ews_connection_get_folder (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_move_items_start
- (EEwsConnection *cnc,
+void e_ews_connection_move_items (EEwsConnection *cnc,
gint pri,
const gchar *folder_id,
gboolean docopy,
GSList *ids,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_move_items_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **items,
GError **error);
-gboolean e_ews_connection_move_items (EEwsConnection *cnc,
+gboolean e_ews_connection_move_items_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *folder_id,
gboolean docopy,
@@ -617,20 +613,20 @@ gboolean e_ews_connection_move_items (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_create_attachments_start
+void e_ews_connection_create_attachments
(EEwsConnection *cnc,
gint pri,
const EwsId *parent,
const GSList *files,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
GSList * e_ews_connection_create_attachments_finish
(EEwsConnection *cnc,
gchar **change_key,
GAsyncResult *result,
GError **error);
-GSList * e_ews_connection_create_attachments
+GSList * e_ews_connection_create_attachments_sync
(EEwsConnection *cnc,
gint pri,
const EwsId *parent,
@@ -639,42 +635,42 @@ GSList * e_ews_connection_create_attachments
GCancellable *cancellable,
GError **error);
-void e_ews_connection_delete_attachments_start
+void e_ews_connection_delete_attachments
(EEwsConnection *cnc,
gint pri,
const GSList *ids,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
GSList * e_ews_connection_delete_attachments_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GError **error);
-GSList * e_ews_connection_delete_attachments
+GSList * e_ews_connection_delete_attachments_sync
(EEwsConnection *cnc,
gint pri,
const GSList *ids,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_get_attachments_start
+void e_ews_connection_get_attachments
(EEwsConnection *cnc,
gint pri,
const gchar *comp_uid,
const GSList *ids,
const gchar *cache,
gboolean include_mime,
- GAsyncReadyCallback cb,
ESoapProgressFn progress_fn,
gpointer progress_data,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
GSList * e_ews_connection_get_attachments_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **items,
GError **error);
-GSList * e_ews_connection_get_attachments
+GSList * e_ews_connection_get_attachments_sync
(EEwsConnection *cnc,
gint pri,
const gchar *comp_uid,
@@ -687,29 +683,28 @@ GSList * e_ews_connection_get_attachments
GCancellable *cancellable,
GError **error);
-void e_ews_connection_get_oal_list_start
- (EEwsConnection *cnc,
- GAsyncReadyCallback cb,
+void e_ews_connection_get_oal_list (EEwsConnection *cnc,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_get_oal_list_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **oals,
GError **error);
-void e_ews_connection_get_oal_detail_start
- (EEwsConnection *cnc,
+
+void e_ews_connection_get_oal_detail (EEwsConnection *cnc,
const gchar *oal_id,
const gchar *oal_element,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_get_oal_detail_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **elements,
GError **error);
-gboolean e_ews_connection_get_oal_detail
+gboolean e_ews_connection_get_oal_detail_sync
(EEwsConnection *cnc,
const gchar *oal_id,
const gchar *oal_element,
@@ -717,20 +712,19 @@ gboolean e_ews_connection_get_oal_detail
GCancellable *cancellable,
GError **error);
-void e_ews_connection_get_free_busy_start
- (EEwsConnection *cnc,
+void e_ews_connection_get_free_busy (EEwsConnection *cnc,
gint pri,
EEwsRequestCreationCallback free_busy_cb,
gpointer free_busy_user_data,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_get_free_busy_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GSList **free_busy,
GError **error);
-gboolean e_ews_connection_get_free_busy
+gboolean e_ews_connection_get_free_busy_sync
(EEwsConnection *cnc,
gint pri,
EEwsRequestCreationCallback free_busy_cb,
@@ -739,19 +733,19 @@ gboolean e_ews_connection_get_free_busy
GCancellable *cancellable,
GError **error);
-void e_ews_connection_download_oal_file_start
+void e_ews_connection_download_oal_file
(EEwsConnection *cnc,
const gchar *cache_filename,
- GAsyncReadyCallback cb,
EwsProgressFn progress_fn,
gpointer progress_data,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_download_oal_file_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GError **error);
-gboolean e_ews_connection_download_oal_file
+gboolean e_ews_connection_download_oal_file_sync
(EEwsConnection *cnc,
const gchar *cache_filename,
EwsProgressFn progress_fn,
@@ -759,20 +753,20 @@ gboolean e_ews_connection_download_oal_file
GCancellable *cancellable,
GError **error);
-void e_ews_connection_get_delegate_start
- (EEwsConnection *cnc,
+void e_ews_connection_get_delegate (EEwsConnection *cnc,
gint pri,
const gchar *mail_id,
const gchar *include_permissions,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_get_delegate_finish
(EEwsConnection *cnc,
GAsyncResult *result,
EwsDelegateInfo **get_delegate,
GError **error);
-gboolean e_ews_connection_get_delegate (EEwsConnection *cnc,
+gboolean e_ews_connection_get_delegate_sync
+ (EEwsConnection *cnc,
gint pri,
const gchar *mail_id,
const gchar *include_permissions,
@@ -780,36 +774,36 @@ gboolean e_ews_connection_get_delegate (EEwsConnection *cnc,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_get_oof_settings_start
+void e_ews_connection_get_oof_settings
(EEwsConnection *cnc,
gint pri,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_get_oof_settings_finish
(EEwsConnection *cnc,
GAsyncResult *result,
OOFSettings **oof_settings,
GError **error);
-gboolean e_ews_connection_get_oof_settings
+gboolean e_ews_connection_get_oof_settings_sync
(EEwsConnection *cnc,
gint pri,
OOFSettings **oof_settings,
GCancellable *cancellable,
GError **error);
-void e_ews_connection_set_oof_settings_start
+void e_ews_connection_set_oof_settings
(EEwsConnection *cnc,
gint pri,
OOFSettings *oof_settings,
- GAsyncReadyCallback cb,
GCancellable *cancellable,
+ GAsyncReadyCallback callback,
gpointer user_data);
gboolean e_ews_connection_set_oof_settings_finish
(EEwsConnection *cnc,
GAsyncResult *result,
GError **error);
-gboolean e_ews_connection_set_oof_settings
+gboolean e_ews_connection_set_oof_settings_sync
(EEwsConnection *cnc,
gint pri,
OOFSettings *oof_settings,
diff --git a/src/server/tests/test-autocompletion.c b/src/server/tests/test-autocompletion.c
index d9144eb..0227609 100644
--- a/src/server/tests/test-autocompletion.c
+++ b/src/server/tests/test-autocompletion.c
@@ -92,9 +92,10 @@ op_test_resolve_names ()
cnc = e_ews_connection_new (uri, username, password, NULL, NULL, NULL);
g_assert (cnc != NULL);
- e_ews_connection_resolve_names_start (cnc, EWS_PRIORITY_MEDIUM, username,
- EWS_SEARCH_AD, NULL, FALSE, resolve_names_cb,
- cancellable, NULL);
+ e_ews_connection_resolve_names (
+ cnc, EWS_PRIORITY_MEDIUM, username,
+ EWS_SEARCH_AD, NULL, FALSE, cancellable,
+ resolve_names_cb, NULL);
}
diff --git a/src/server/tests/test-createfolder.c b/src/server/tests/test-createfolder.c
index 6b45ee3..d32c220 100644
--- a/src/server/tests/test-createfolder.c
+++ b/src/server/tests/test-createfolder.c
@@ -87,10 +87,10 @@ op_test_create_folder ()
cnc = e_ews_connection_new (uri, username, password, NULL, NULL, NULL);
g_assert (cnc != NULL);
- e_ews_connection_create_folder_start (cnc, EWS_PRIORITY_MEDIUM, "inbox",
- TRUE ,"test",
- create_folder_cb,
- cancellable, NULL);
+ e_ews_connection_create_folder (
+ cnc, EWS_PRIORITY_MEDIUM, "inbox",
+ TRUE ,"test", cancellable,
+ create_folder_cb, NULL);
}
diff --git a/src/server/tests/test-cuditem.c b/src/server/tests/test-cuditem.c
index b7af490..4f25064 100644
--- a/src/server/tests/test-cuditem.c
+++ b/src/server/tests/test-cuditem.c
@@ -114,11 +114,11 @@ op_test_create_item ()
//to check how to change to real data
folderid = "AQASAG1hbmR5Lnd1QGludGVsLmNvbQAuAAADnUl3sZrICU6Xd1qXV+rpVwEAJvRPgQpR30KhJ7wqBr4YXgAAAY6W+gAAAA==";
- e_ews_connection_create_items_start (cnc, EWS_PRIORITY_MEDIUM,
- NULL, "SendToAllAndSaveCopy", folderid,
- op_test_create_item_get_soap_msg, NULL,
- create_item_ready_callback,
- cancellable, NULL);
+ e_ews_connection_create_items (
+ cnc, EWS_PRIORITY_MEDIUM,
+ NULL, "SendToAllAndSaveCopy", folderid,
+ op_test_create_item_get_soap_msg, NULL,
+ cancellable, create_item_ready_callback, NULL);
}
static gboolean
diff --git a/src/server/tests/test-deletefolder.c b/src/server/tests/test-deletefolder.c
index deabf97..279372c 100644
--- a/src/server/tests/test-deletefolder.c
+++ b/src/server/tests/test-deletefolder.c
@@ -78,10 +78,10 @@ op_test_delete_folder (gpointer data)
cnc = e_ews_connection_new (uri, username, password, NULL, NULL, NULL);
g_assert (cnc != NULL);
- e_ews_connection_delete_folder_start (cnc, EWS_PRIORITY_MEDIUM, (*fid)->id,
- FALSE ,"HardDelete",
- delete_folder_cb,
- cancellable, NULL);
+ e_ews_connection_delete_folder (
+ cnc, EWS_PRIORITY_MEDIUM, (*fid)->id,
+ FALSE ,"HardDelete", cancellable,
+ delete_folder_cb, NULL);
}
diff --git a/src/server/tests/test-get-oof-settings.c b/src/server/tests/test-get-oof-settings.c
index abfda43..2476626 100644
--- a/src/server/tests/test-get-oof-settings.c
+++ b/src/server/tests/test-get-oof-settings.c
@@ -82,9 +82,9 @@ op_test_get_oof_settings ()
e_ews_connection_set_mailbox (cnc, email);
- e_ews_connection_get_oof_settings_start (cnc, EWS_PRIORITY_MEDIUM,
- get_oof_settings_cb,
- cancellable, NULL);
+ e_ews_connection_get_oof_settings (
+ cnc, EWS_PRIORITY_MEDIUM, cancellable,
+ get_oof_settings_cb, NULL);
}
static gboolean
diff --git a/src/server/tests/test-getattachment.c b/src/server/tests/test-getattachment.c
index 6afee9a..bf25465 100644
--- a/src/server/tests/test-getattachment.c
+++ b/src/server/tests/test-getattachment.c
@@ -91,11 +91,11 @@ op_test_get_attachments ()
tmpdir = g_build_filename ("/home/xwu1/evo-cache", NULL); //a test directory that exists already
- e_ews_connection_get_attachments_start (cnc, EWS_PRIORITY_MEDIUM,
- "xuidx", ids, tmpdir, TRUE,
- get_attachments_ready_callback,
- NULL, NULL,
- cancellable, NULL);
+ e_ews_connection_get_attachments (
+ cnc, EWS_PRIORITY_MEDIUM,
+ "xuidx", ids, tmpdir, TRUE,
+ NULL, NULL, cancellable,
+ get_attachments_ready_callback, NULL);
g_free (tmpdir);
}
diff --git a/src/server/tests/test-getdelegate.c b/src/server/tests/test-getdelegate.c
index 2afbd37..2223b47 100644
--- a/src/server/tests/test-getdelegate.c
+++ b/src/server/tests/test-getdelegate.c
@@ -86,10 +86,10 @@ op_test_get_delegate ()
cnc = e_ews_connection_new (uri, username, password, NULL, NULL, NULL);
g_assert (cnc != NULL);
- e_ews_connection_get_delegate_start (cnc, EWS_PRIORITY_MEDIUM, "abc xyz com",
- "true" ,
- get_delegate_cb,
- cancellable, NULL);
+ e_ews_connection_get_delegate (
+ cnc, EWS_PRIORITY_MEDIUM, "abc xyz com",
+ "true", cancellable,
+ get_delegate_cb, NULL);
}
diff --git a/src/server/tests/test-set-oof-settings.c b/src/server/tests/test-set-oof-settings.c
index 413a29b..3f0b503 100644
--- a/src/server/tests/test-set-oof-settings.c
+++ b/src/server/tests/test-set-oof-settings.c
@@ -98,10 +98,10 @@ op_test_set_oof_settings ()
e_ews_connection_set_mailbox (cnc, email);
set_arbit_values ();
- e_ews_connection_set_oof_settings_start (cnc, EWS_PRIORITY_MEDIUM,
- oof_settings,
- set_oof_settings_cb,
- cancellable, NULL);
+ e_ews_connection_set_oof_settings (
+ cnc, EWS_PRIORITY_MEDIUM,
+ oof_settings, cancellable,
+ set_oof_settings_cb, NULL);
}
static gboolean
diff --git a/src/server/tests/test-syncfolder.c b/src/server/tests/test-syncfolder.c
index 7c22906..22982cb 100644
--- a/src/server/tests/test-syncfolder.c
+++ b/src/server/tests/test-syncfolder.c
@@ -103,11 +103,12 @@ op_test_sync_folder_items ()
cnc = e_ews_connection_new (uri, username, password, NULL, NULL, NULL);
g_assert (cnc != NULL);
- e_ews_connection_sync_folder_items_start (cnc, EWS_PRIORITY_MEDIUM,
- NULL, folder_id->id,
- "Default", "",
- 500, folder_items_ready_callback,
- cancellable, NULL);
+ e_ews_connection_sync_folder_items (
+ cnc, EWS_PRIORITY_MEDIUM,
+ NULL, folder_id->id,
+ "Default", "",
+ 500, cancellable,
+ folder_items_ready_callback, NULL);
}
static void
@@ -175,9 +176,10 @@ op_test_sync_folder_hierarchy ()
cnc = e_ews_connection_new (uri, username, password, NULL, NULL, NULL);
g_assert (cnc != NULL);
- e_ews_connection_sync_folder_hierarchy_start (cnc, EWS_PRIORITY_MEDIUM,
- NULL, folder_hierarchy_ready_callback,
- cancellable, NULL);
+ e_ews_connection_sync_folder_hierarchy (
+ cnc, EWS_PRIORITY_MEDIUM,
+ NULL, cancellable,
+ folder_hierarchy_ready_callback, NULL);
}
@@ -236,10 +238,11 @@ op_test_get_item ()
g_assert (cnc != NULL);
ids = g_slist_reverse (ids);
- e_ews_connection_get_items_start (cnc, EWS_PRIORITY_MEDIUM,
- g_slist_last (ids), "IdOnly", NULL, FALSE, NULL,
- get_item_ready_callback, NULL, NULL,
- cancellable, NULL);
+ e_ews_connection_get_items (
+ cnc, EWS_PRIORITY_MEDIUM,
+ g_slist_last (ids), "IdOnly", NULL, FALSE, NULL,
+ NULL, NULL, cancellable,
+ get_item_ready_callback, NULL);
g_slist_foreach (ids, (GFunc) g_free, NULL);
g_slist_free (ids);
diff --git a/src/utils/ews-camel-common.c b/src/utils/ews-camel-common.c
index 0a3941c..0793e11 100644
--- a/src/utils/ews-camel-common.c
+++ b/src/utils/ews-camel-common.c
@@ -145,10 +145,11 @@ camel_ews_utils_create_mime_message (EEwsConnection *cnc,
}
}
- res = e_ews_connection_create_items (cnc, EWS_PRIORITY_MEDIUM,
- disposition, NULL, save_folder,
- create_mime_message_cb, create_data,
- &ids, cancellable, error);
+ res = e_ews_connection_create_items_sync (
+ cnc, EWS_PRIORITY_MEDIUM,
+ disposition, NULL, save_folder,
+ create_mime_message_cb, create_data,
+ &ids, cancellable, error);
if (restore_from) {
struct _camel_header_raw *header;
diff --git a/src/utils/ews-test-finditem-query.c b/src/utils/ews-test-finditem-query.c
index c548e0b..6e38556 100644
--- a/src/utils/ews-test-finditem-query.c
+++ b/src/utils/ews-test-finditem-query.c
@@ -124,10 +124,11 @@ op_test_finditem_run (void)
fid->id = g_strdup (folder_name);
fid->is_distinguished_id = TRUE;
- e_ews_connection_find_folder_items_start (cnc, EWS_PRIORITY_MEDIUM, fid,
- "IdOnly", NULL, NULL, CONTACTS_QUERY,
- folder_type, (EwsConvertQueryCallback) (e_ews_query_to_restriction),
- find_folder_item_callback, cancellable, (gpointer) folder_name);
+ e_ews_connection_find_folder_items (
+ cnc, EWS_PRIORITY_MEDIUM, fid,
+ "IdOnly", NULL, NULL, CONTACTS_QUERY,
+ folder_type, (EwsConvertQueryCallback) (e_ews_query_to_restriction),
+ cancellable, find_folder_item_callback, (gpointer) folder_name);
e_ews_folder_free_fid (fid);
/*Check for calendar folder*/
@@ -137,10 +138,11 @@ op_test_finditem_run (void)
fid->id = g_strdup (folder_name);
fid->is_distinguished_id = TRUE;
- e_ews_connection_find_folder_items_start (cnc, EWS_PRIORITY_MEDIUM, fid,
- "IdOnly", NULL, NULL, CALENDAR_QUERY,
- folder_type, (EwsConvertQueryCallback) (e_ews_query_to_restriction),
- find_folder_item_callback, cancellable, (gpointer) folder_name);
+ e_ews_connection_find_folder_items (
+ cnc, EWS_PRIORITY_MEDIUM, fid,
+ "IdOnly", NULL, NULL, CALENDAR_QUERY,
+ folder_type, (EwsConvertQueryCallback) (e_ews_query_to_restriction),
+ cancellable, find_folder_item_callback, (gpointer) folder_name);
e_ews_folder_free_fid (fid);
/*Check for mail folder*/
@@ -150,10 +152,11 @@ op_test_finditem_run (void)
fid->id = g_strdup (folder_name);
fid->is_distinguished_id = TRUE;
- e_ews_connection_find_folder_items_start (cnc, EWS_PRIORITY_MEDIUM, fid,
- "IdOnly", NULL, NULL, MAIL_QUERY,
- folder_type, (EwsConvertQueryCallback) (e_ews_query_to_restriction),
- find_folder_item_callback, cancellable, (gpointer) folder_name);
+ e_ews_connection_find_folder_items (
+ cnc, EWS_PRIORITY_MEDIUM, fid,
+ "IdOnly", NULL, NULL, MAIL_QUERY,
+ folder_type, (EwsConvertQueryCallback) (e_ews_query_to_restriction),
+ cancellable, find_folder_item_callback, (gpointer) folder_name);
e_ews_folder_free_fid (fid);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
