[evolution-ews] Do not check for presence of *error, assume **error is not NULL while syncing deleted contacts as me
- From: Chenthill Palanisamy <pchen src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] Do not check for presence of *error, assume **error is not NULL while syncing deleted contacts as me
- Date: Thu, 23 Jun 2011 08:36:00 +0000 (UTC)
commit bbefc5e2b45f54e15af6c91b5baaa9a06b8a3cfb
Author: Chenthill Palanisamy <pchenthill novell com>
Date: Thu Jun 23 13:16:11 2011 +0530
Do not check for presence of *error, assume **error is not NULL while syncing deleted contacts
as mentioned in function documentation.
src/addressbook/e-book-backend-ews.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 2af2db4..24746b8 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -256,9 +256,9 @@ ebews_set_full_name (ESoapMessage *msg, EContact *contact)
{
gchar *val;
-// if ((val = e_contact_get (contact, E_CONTACT_FULL_NAME)))
-// e_ews_message_write_string_parameter(msg, "FullName", NULL, val);
-// g_free (val);
+ if ((val = e_contact_get (contact, E_CONTACT_FULL_NAME)))
+ e_ews_message_write_string_parameter(msg, "FullName", NULL, val);
+ g_free (val);
if ((val = e_contact_get (contact, E_CONTACT_GIVEN_NAME)))
e_ews_message_write_string_parameter(msg, "GivenName", NULL, val);
@@ -953,10 +953,12 @@ ebews_sync_deleted_items (EBookBackendEws *ebews, GSList *deleted_ids, GError **
priv = ebews->priv;
- for (l = deleted_ids; l != NULL && *error != NULL; l = g_slist_next (l)) {
+ for (l = deleted_ids; l != NULL; l = g_slist_next (l)) {
gchar *id = (gchar *) l->data;
+ gboolean partial_content;
- e_book_backend_sqlitedb_remove_contact (priv->ebsdb, priv->folder_id, id, NULL);
+ if (e_book_backend_sqlitedb_has_contact (priv->ebsdb, priv->folder_id, id, &partial_content, NULL))
+ e_book_backend_sqlitedb_remove_contact (priv->ebsdb, priv->folder_id, id, error);
e_book_backend_notify_remove (E_BOOK_BACKEND (ebews), id);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]