r2567 - /unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Sat Apr 26 17:01:09 UTC 2014
Author: jordi
Date: Sat Apr 26 17:01:09 2014
New Revision: 2567
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2567
Log:
Extend patch to cover all API changes.
Modified:
unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch
Modified: unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch?rev=2567&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch (original)
+++ unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch Sat Apr 26 17:01:09 2014
@@ -3,8 +3,8 @@
Index: evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-fast-transfer.c
===================================================================
---- evolution-mapi-3.12.1.orig/src/libexchangemapi/e-mapi-fast-transfer.c 2014-03-24 10:28:56.000000000 +0100
-+++ evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-fast-transfer.c 2014-04-26 18:19:44.114781001 +0200
+--- evolution-mapi-3.12.1.orig/src/libexchangemapi/e-mapi-fast-transfer.c 2014-04-26 18:56:53.592313462 +0200
++++ evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-fast-transfer.c 2014-04-26 18:56:53.584313433 +0200
@@ -107,9 +107,9 @@
/* g_print ("\tMarker: %s (0x%08x)\n", get_proptag_name (marker), marker); */
@@ -111,15 +111,161 @@
}
parser = fxparser_init (data.mem_ctx, &data);
-@@ -491,9 +491,9 @@
+Index: evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-connection.c
+===================================================================
+--- evolution-mapi-3.12.1.orig/src/libexchangemapi/e-mapi-connection.c 2014-04-26 18:56:53.592313462 +0200
++++ evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-connection.c 2014-04-26 18:56:53.584313433 +0200
+@@ -3756,7 +3756,7 @@
+
+ count = 0;
+ for (recipient = recipients, ii = 0; recipient; recipient = recipient->next, ii++) {
+- if (!e_mapi_util_find_array_propval (&recipient->properties, PidTagPrimarySmtpAddress)
++ if (!e_mapi_util_find_array_propval (&recipient->properties, PidTagSmtpAddress)
+ && !e_mapi_util_find_array_propval (&recipient->properties, PidTagDisplayName))
+ g_debug ("%s: Cannot get email or display name for a recipient %d, skipping it", G_STRFUNC, ii);
+ else
+@@ -3777,7 +3777,7 @@
}
- if (!(transfer_flags & E_MAPI_FAST_TRANSFER_FLAG_ATTACHMENTS))
-- add (PidTagMessageAttachments);
-+ add (MessageAttachments);
- if (!(transfer_flags & E_MAPI_FAST_TRANSFER_FLAG_RECIPIENTS))
-- add (PidTagMessageRecipients);
-+ add (MessageRecipients);
-
- #undef add
-
+ for (ii = 0, jj = 0, recipient = recipients; ii < count && recipient != NULL; ii++, recipient = recipient->next) {
+- users[ii] = e_mapi_util_find_array_propval (&recipient->properties, PidTagPrimarySmtpAddress);
++ users[ii] = e_mapi_util_find_array_propval (&recipient->properties, PidTagSmtpAddress);
+ if (!users[ii])
+ users[ii] = e_mapi_util_find_array_propval (&recipient->properties, PidTagDisplayName);
+ if (!users[ii]) {
+Index: evolution-mapi-3.12.1/src/configuration/e-mapi-search-gal-user.c
+===================================================================
+--- evolution-mapi-3.12.1.orig/src/configuration/e-mapi-search-gal-user.c 2014-04-26 18:56:53.592313462 +0200
++++ evolution-mapi-3.12.1/src/configuration/e-mapi-search-gal-user.c 2014-04-26 18:56:53.584313433 +0200
+@@ -270,8 +270,8 @@
+
+ restriction->res.resOr.res[1].rt = RES_CONTENT;
+ restriction->res.resOr.res[1].res.resContent.fuzzy = FL_SUBSTRING | FL_IGNORECASE;
+- restriction->res.resOr.res[1].res.resContent.ulPropTag = PidTagPrimarySmtpAddress;
+- restriction->res.resOr.res[1].res.resContent.lpProp.ulPropTag = PidTagPrimarySmtpAddress;
++ restriction->res.resOr.res[1].res.resContent.ulPropTag = PidTagSmtpAddress;
++ restriction->res.resOr.res[1].res.resContent.lpProp.ulPropTag = PidTagSmtpAddress;
+ restriction->res.resOr.res[1].res.resContent.lpProp.value.lpszW = talloc_strdup (mem_ctx, search_text);
+
+ *restrictions = restriction;
+@@ -316,7 +316,7 @@
+
+ SPropTagArray_add (mem_ctx, props, PidTagEntryId);
+ SPropTagArray_add (mem_ctx, props, PidTagDisplayName);
+- SPropTagArray_add (mem_ctx, props, PidTagPrimarySmtpAddress);
++ SPropTagArray_add (mem_ctx, props, PidTagSmtpAddress);
+ SPropTagArray_add (mem_ctx, props, PidTagEmailAddress);
+
+ return TRUE;
+@@ -341,7 +341,7 @@
+ g_return_val_if_fail (sid != NULL, FALSE);
+
+ display_name = e_mapi_util_find_array_propval (&object->properties, PidTagDisplayName);
+- email = e_mapi_util_find_array_propval (&object->properties, PidTagPrimarySmtpAddress);
++ email = e_mapi_util_find_array_propval (&object->properties, PidTagSmtpAddress);
+ entry_id = e_mapi_util_find_array_propval (&object->properties, PidTagEntryId);
+ user_dn = e_mapi_util_find_array_propval (&object->properties, PidTagEmailAddress);
+
+Index: evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-book-utils.c
+===================================================================
+--- evolution-mapi-3.12.1.orig/src/libexchangemapi/e-mapi-book-utils.c 2014-04-26 18:56:53.592313462 +0200
++++ evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-book-utils.c 2014-04-26 18:56:53.588313447 +0200
+@@ -95,7 +95,7 @@
+ PidTagStateOrProvince,
+ PidTagPostalCode,
+ PidTagCountry,
+- PidTagPrimarySmtpAddress,
++ PidTagSmtpAddress,
+ PidTagFolderId
+ };
+
+@@ -371,7 +371,7 @@
+
+ email_1 = e_contact_get (contact, E_CONTACT_EMAIL_1);
+ if (!email_1) {
+- gconstpointer value = get_proptag (PidTagPrimarySmtpAddress);
++ gconstpointer value = get_proptag (PidTagSmtpAddress);
+
+ if (value)
+ e_contact_set (contact, E_CONTACT_EMAIL_1, value);
+@@ -1009,7 +1009,7 @@
+ res->res.resOr.cRes = 4;
+ res->res.resOr.res = talloc_zero_array (esp->mem_ctx, struct mapi_SRestriction_or, res->res.resOr.cRes + 1);
+
+- proptag = PidTagPrimarySmtpAddress;
++ proptag = PidTagSmtpAddress;
+ res->res.resOr.res[0].rt = RES_CONTENT;
+ res->res.resOr.res[0].res.resContent.fuzzy = fuzzy | FL_IGNORECASE;
+ res->res.resOr.res[0].res.resContent.ulPropTag = proptag;
+@@ -1115,7 +1115,7 @@
+ res->res.resOr.res = talloc_zero_array (esp->mem_ctx, struct mapi_SRestriction_or, res->res.resOr.cRes + 1);
+
+ res->res.resOr.res[0].rt = RES_EXIST;
+- res->res.resOr.res[0].res.resExist.ulPropTag = PidTagPrimarySmtpAddress;
++ res->res.resOr.res[0].res.resExist.ulPropTag = PidTagSmtpAddress;
+
+ for (ii = 1, jj = 0; emails[jj]; jj++) {
+ proptag = get_proptag_from_field_name (emails[jj], TRUE);
+Index: evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-cal-utils.c
+===================================================================
+--- evolution-mapi-3.12.1.orig/src/libexchangemapi/e-mapi-cal-utils.c 2014-04-26 18:56:53.592313462 +0200
++++ evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-cal-utils.c 2014-04-26 18:56:53.588313447 +0200
+@@ -686,11 +686,11 @@
+ PidTagNickname,
+ PidTagRecipientDisplayName,
+ PidTagDisplayName,
+- PidTag7BitDisplayName
++ PidTagAddressBookDisplayNamePrintable
+ };
+
+ const uint32_t email_proptags[] = {
+- PidTagPrimarySmtpAddress,
++ PidTagSmtpAddress,
+ PidTagSmtpAddress
+ };
+
+@@ -1352,7 +1352,7 @@
+ set_value (PidTagEmailAddress, email);
+
+ set_value (PidTagSmtpAddress, email);
+- set_value (PidTagPrimarySmtpAddress, email);
++ set_value (PidTagSmtpAddress, email);
+
+ ui32 = 0;
+ set_value (PidTagSendInternetEncoding, &ui32);
+@@ -1435,7 +1435,7 @@
+ set_value (PidTagEmailAddress, email);
+
+ set_value (PidTagSmtpAddress, email);
+- set_value (PidTagPrimarySmtpAddress, email);
++ set_value (PidTagSmtpAddress, email);
+
+ ui32 = 0;
+ set_value (PidTagSendInternetEncoding, &ui32);
+Index: evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-mail-utils.c
+===================================================================
+--- evolution-mapi-3.12.1.orig/src/libexchangemapi/e-mapi-mail-utils.c 2014-04-26 18:56:53.592313462 +0200
++++ evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-mail-utils.c 2014-04-26 18:57:37.556472994 +0200
+@@ -112,11 +112,11 @@
+ PidTagNickname,
+ PidTagDisplayName,
+ PidTagRecipientDisplayName,
+- PidTag7BitDisplayName
++ PidTagAddressBookDisplayNamePrintable
+ };
+
+ const uint32_t email_proptags[] = {
+- PidTagPrimarySmtpAddress,
++ PidTagSmtpAddress,
+ PidTagSmtpAddress
+ };
+
+@@ -989,7 +989,7 @@
+ set_value (PidTagEmailAddress, email);
+
+ set_value (PidTagSmtpAddress, email);
+- set_value (PidTagPrimarySmtpAddress, email);
++ set_value (PidTagSmtpAddress, email);
+ }
+
+ ui32 = 0;
More information about the pkg-evolution-commits
mailing list