diff options
| author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-05-07 17:56:12 +0800 |
|---|---|---|
| committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-05-07 17:56:12 +0800 |
| commit | 9cc52c9513f9040e6897871040e8e8925909da53 (patch) | |
| tree | fb9a10e32976a8cf52d40477f96ba303e5c7da41 /mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c | |
| parent | e460bbdb9b943c7c9bb8041cb4ca6f22a5682833 (diff) | |
| download | marcuscom-ports-9cc52c9513f9040e6897871040e8e8925909da53.tar.gz marcuscom-ports-9cc52c9513f9040e6897871040e8e8925909da53.tar.zst marcuscom-ports-9cc52c9513f9040e6897871040e8e8925909da53.zip | |
Update evolution-mapi to 3.12.1. Bring in and adapt the patch from evolution-mapi
to track the OpenChanges 2.1 API changes [1]. That revision patches the not
autotooled version, because of that we miss HAVE_FAST_TRANSFER_TAGS_2_1
so I disabled some defines that did depend on that HAVE_TRANSFER_TAGS_2_1 in
src/libexchangemapi/e-mapi-fast-transfer.c
Also bring pull in evo-mapi into the gnome3 build again. Bump gnome3 to
reflect this.
[1] commit 588b4ec9367a2
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19608 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c')
| -rw-r--r-- | mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c new file mode 100644 index 000000000..3b5edc62c --- /dev/null +++ b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c @@ -0,0 +1,22 @@ +diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c +index dc73408..5ae1aab 100644 +--- src/libexchangemapi/e-mapi-connection.c.orig ++++ src/libexchangemapi/e-mapi-connection.c +@@ -3756,7 +3756,7 @@ add_object_recipients (EMapiConnection *conn, + + 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 @@ add_object_recipients (EMapiConnection *conn, + } + + 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]) { |