r1719 - in /experimental/evolution-mapi/debian: changelog patches/ patches/newer-openchange.patch patches/series
jelmer at users.alioth.debian.org
jelmer at users.alioth.debian.org
Tue Sep 7 12:54:02 UTC 2010
Author: jelmer
Date: Tue Sep 7 12:53:59 2010
New Revision: 1719
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1719
Log:
Backport changes from svn required to support newer versions of
OpenChange. Thanks Bharath Acharya for the help finding what
patches to backport.
Added:
experimental/evolution-mapi/debian/patches/
experimental/evolution-mapi/debian/patches/newer-openchange.patch
experimental/evolution-mapi/debian/patches/series
Modified:
experimental/evolution-mapi/debian/changelog
Modified: experimental/evolution-mapi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-mapi/debian/changelog?rev=1719&op=diff
==============================================================================
--- experimental/evolution-mapi/debian/changelog (original)
+++ experimental/evolution-mapi/debian/changelog Tue Sep 7 12:53:59 2010
@@ -14,6 +14,9 @@
[ Jelmer Vernooij ]
* Switch to source format 3.
* Bump standards version to 3.9.1 (no changes).
+ * Backport changes from svn required to support newer versions of
+ OpenChange. Thanks Bharath Acharya for the help finding what
+ patches to backport.
-- Jelmer Vernooij <jelmer at debian.org> Mon, 23 Aug 2010 15:44:29 +0200
Added: experimental/evolution-mapi/debian/patches/newer-openchange.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-mapi/debian/patches/newer-openchange.patch?rev=1719&op=file
==============================================================================
--- experimental/evolution-mapi/debian/patches/newer-openchange.patch (added)
+++ experimental/evolution-mapi/debian/patches/newer-openchange.patch Tue Sep 7 12:53:59 2010
@@ -1,0 +1,483 @@
+--- 0.30.3/config.h.in 2010-09-02 02:43:41.067609755 +0200
++++ 0.30.3-newopenchange/config.h.in 2010-09-02 02:43:12.028591947 +0200
+@@ -30,9 +30,18 @@
+ /* Define to 1 if you have the <locale.h> header file. */
+ #undef HAVE_LOCALE_H
+
++/* libmapi provides cast_mapi_SPropValue with mem context parameter */
++#undef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
++
++/* libmapi provides cast_SPropValue with mem context parameter */
++#undef HAVE_MEMCTX_ON_CAST_SPROPVALUE
++
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
++/* libmapi provides PR_RECIPIENT_FLAGS */
++#undef HAVE_PR_RECIPIENT_FLAGS
++
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+
+--- 0.30.3/configure 2010-09-02 02:43:40.817618214 +0200
++++ 0.30.3-newopenchange/configure 2010-09-02 02:21:07.243314095 +0200
+@@ -13098,16 +13098,107 @@
+ if ac_fn_c_try_link "$LINENO"; then :
+
+ $as_echo "#define HAVE_CORRECT_REGISTERNOTIFICATION 1" >>confdefs.h
+- ac_cv_have_crn=yes
++ ac_cv_have_wtu=yes
+ else
+- ac_cv_have_crn=no
++ ac_cv_have_wtu=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS=$save_cflags
+ LIBS=$save_libs
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_crn" >&5
+-$as_echo "$ac_cv_have_crn" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_wtu" >&5
++$as_echo "$ac_cv_have_wtu" >&6; }
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libmapi cast_SPropValue function with three params" >&5
++$as_echo_n "checking libmapi cast_SPropValue function with three params... " >&6; }
++save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
++save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <libmapi/libmapi.h>
++int
++main ()
++{
++cast_SPropValue (NULL, NULL, NULL)
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++$as_echo "#define HAVE_MEMCTX_ON_CAST_SPROPVALUE 1" >>confdefs.h
++ ac_cv_have_mocs=yes
++else
++ ac_cv_have_mocs=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++CFLAGS=$save_cflags
++LIBS=$save_libs
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_mocs" >&5
++$as_echo "$ac_cv_have_mocs" >&6; }
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libmapi cast_mapi_SPropValue function with three params" >&5
++$as_echo_n "checking libmapi cast_mapi_SPropValue function with three params... " >&6; }
++save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
++save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <libmapi/libmapi.h>
++int
++main ()
++{
++cast_mapi_SPropValue (NULL, NULL, NULL)
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++$as_echo "#define HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE 1" >>confdefs.h
++ ac_cv_have_mocms=yes
++else
++ ac_cv_have_mocms=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++CFLAGS=$save_cflags
++LIBS=$save_libs
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_mocms" >&5
++$as_echo "$ac_cv_have_mocms" >&6; }
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libmapi provides PR_RECIPIENT_FLAGS" >&5
++$as_echo_n "checking libmapi provides PR_RECIPIENT_FLAGS... " >&6; }
++save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
++save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <libmapi/libmapi.h>
++int
++main ()
++{
++printf ("%d", PR_RECIPIENT_FLAGS)
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++$as_echo "#define HAVE_PR_RECIPIENT_FLAGS 1" >>confdefs.h
++ ac_cv_have_prf=yes
++else
++ ac_cv_have_prf=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++CFLAGS=$save_cflags
++LIBS=$save_libs
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_prf" >&5
++$as_echo "$ac_cv_have_prf" >&6; }
++
++if test "x${ac_cv_have_prf}" = "xno"; then
++ CFLAGS="$CFLAGS -DPR_RECIPIENT_FLAGS=PR_RECIPIENTS_FLAGS"
++fi
+
+ API_VERSION=$EDS_PACKAGE
+
+=== modified file 'configure.ac'
+--- a/configure.ac 2010-06-21 13:45:46 +0000
++++ b/configure.ac 2010-09-02 00:19:11 +0000
+@@ -147,10 +147,56 @@
+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ [[#include <libmapi/libmapi.h>]],
+ [[RegisterNotification (NULL, 0)]])],
+- [AC_DEFINE(HAVE_CORRECT_REGISTERNOTIFICATION, 1, [libmapi provides correct RegisterNotification function]) ac_cv_have_crn=yes],[ac_cv_have_crn=no])
+-CFLAGS=$save_cflags
+-LIBS=$save_libs
+-AC_MSG_RESULT([$ac_cv_have_crn])
++ [AC_DEFINE(HAVE_CORRECT_REGISTERNOTIFICATION, 1, [libmapi provides correct RegisterNotification function]) ac_cv_have_wtu=yes],[ac_cv_have_wtu=no])
++CFLAGS=$save_cflags
++LIBS=$save_libs
++AC_MSG_RESULT([$ac_cv_have_wtu])
++
++dnl ****************************
++dnl Check for cast_SPropValue function with three params
++dnl ****************************
++AC_MSG_CHECKING([libmapi cast_SPropValue function with three params])
++save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
++save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM(
++ [[#include <libmapi/libmapi.h>]],
++ [[cast_SPropValue (NULL, NULL, NULL)]])],
++ [AC_DEFINE(HAVE_MEMCTX_ON_CAST_SPROPVALUE, 1, [libmapi provides cast_SPropValue with mem context parameter]) ac_cv_have_mocs=yes],[ac_cv_have_mocs=no])
++CFLAGS=$save_cflags
++LIBS=$save_libs
++AC_MSG_RESULT([$ac_cv_have_mocs])
++
++dnl ****************************
++dnl Check for cast_mapi_SPropValue function with three params
++dnl ****************************
++AC_MSG_CHECKING([libmapi cast_mapi_SPropValue function with three params])
++save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
++save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM(
++ [[#include <libmapi/libmapi.h>]],
++ [[cast_mapi_SPropValue (NULL, NULL, NULL)]])],
++ [AC_DEFINE(HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE, 1, [libmapi provides cast_mapi_SPropValue with mem context parameter]) ac_cv_have_mocms=yes],[ac_cv_have_mocms=no])
++CFLAGS=$save_cflags
++LIBS=$save_libs
++AC_MSG_RESULT([$ac_cv_have_mocms])
++
++dnl ****************************
++dnl Check for PR_RECIPIENT_FLAGS
++dnl ****************************
++AC_MSG_CHECKING([libmapi provides PR_RECIPIENT_FLAGS])
++save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
++save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM(
++ [[#include <libmapi/libmapi.h>]],
++ [[printf ("%d", PR_RECIPIENT_FLAGS)]])],
++ [AC_DEFINE(HAVE_PR_RECIPIENT_FLAGS, 1, [libmapi provides PR_RECIPIENT_FLAGS]) ac_cv_have_prf=yes],[ac_cv_have_prf=no])
++CFLAGS=$save_cflags
++LIBS=$save_libs
++AC_MSG_RESULT([$ac_cv_have_prf])
++
++if test "x${ac_cv_have_prf}" = "xno"; then
++ CFLAGS="$CFLAGS -DPR_RECIPIENT_FLAGS=PR_RECIPIENTS_FLAGS"
++fi
+
+ dnl ****************************
+ dnl Expose version information
+
+=== modified file 'src/calendar/e-cal-backend-mapi.c'
+--- a/src/calendar/e-cal-backend-mapi.c 2010-06-15 18:33:54 +0000
++++ b/src/calendar/e-cal-backend-mapi.c 2010-09-02 00:30:36 +0000
+@@ -126,7 +126,7 @@
+ PR_RCVD_REPRESENTING_EMAIL_ADDRESS_UNICODE,
+ PR_RCVD_REPRESENTING_NAME_UNICODE,
+ PR_RECIPIENT_DISPLAY_NAME_UNICODE,
+- PR_RECIPIENTS_FLAGS,
++ PR_RECIPIENT_FLAGS,
+ PR_RECIPIENT_TRACKSTATUS,
+ PR_RECIPIENT_TYPE,
+ PR_RENDERING_POSITION,
+@@ -649,6 +650,7 @@
+ gboolean use_restriction = FALSE;
+ GSList *ls = NULL;
+ struct deleted_items_data did;
++ TALLOC_CTX *mem_ctx = NULL;
+
+ if (!handle)
+ return FALSE;
+@@ -670,6 +672,7 @@
+ struct SPropValue sprop;
+ struct timeval t;
+
++ mem_ctx = talloc_init ("ExchangeMAPI_get_deltas_cal");
+ use_restriction = TRUE;
+ res.rt = RES_PROPERTY;
+ res.res.resProperty.relop = RELOP_GE;
+@@ -678,7 +681,11 @@
+ t.tv_sec = icaltime_as_timet_with_zone (itt_cache, icaltimezone_get_utc_timezone ());
+ t.tv_usec = 0;
+ set_SPropValue_proptag_date_timeval (&sprop, PR_LAST_MODIFICATION_TIME, &t);
+- cast_mapi_SPropValue (&(res.res.resProperty.lpProp), &sprop);
++ cast_mapi_SPropValue (
++ #ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
++ mem_ctx,
++ #endif
++ &(res.res.resProperty.lpProp), &sprop);
+ }
+
+ itt_current = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
+@@ -699,6 +706,8 @@
+ e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Error fetching changes from the server."));
+ // e_file_cache_thaw_changes (E_FILE_CACHE (priv->cache));
+ g_static_mutex_unlock (&updating);
++ if (mem_ctx)
++ talloc_free (mem_ctx);
+ return FALSE;
+ }
+ } else if (!exchange_mapi_connection_fetch_items (priv->fid, use_restriction ? &res : NULL, NULL,
+@@ -710,6 +719,8 @@
+ e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Error fetching changes from the server."));
+ // e_file_cache_thaw_changes (E_FILE_CACHE (priv->cache));
+ g_static_mutex_unlock (&updating);
++ if (mem_ctx)
++ talloc_free (mem_ctx);
+ return FALSE;
+ }
+ // e_file_cache_thaw_changes (E_FILE_CACHE (priv->cache));
+@@ -720,6 +731,10 @@
+ e_cal_backend_cache_put_server_utc_time (priv->cache, time_string);
+ g_free (time_string);
+
++ if (mem_ctx) {
++ talloc_free (mem_ctx);
++ mem_ctx = NULL;
++ }
+ /* handle deleted items here by going over the entire cache and
+ * checking for deleted items.*/
+
+@@ -1436,6 +1451,7 @@
+ struct Binary_r sb;
+ uint32_t proptag = 0x0;
+ struct SPropTagArray *array;
++ TALLOC_CTX *mem_ctx;
+
+ uid = icalcomponent_get_uid (comp);
+ exchange_mapi_util_mapi_id_from_string (uid, &mid);
+@@ -1457,13 +1473,20 @@
+ exchange_mapi_cal_util_generate_globalobjectid (TRUE, uid, &sb);
+
+ set_SPropValue_proptag (&sprop, proptag, (const void *) &sb);
+- cast_mapi_SPropValue (&(res.res.resProperty.lpProp), &sprop);
++ mem_ctx = talloc_init ("ExchangeMAPI_cal_get_server_data");
++ cast_mapi_SPropValue (
++ #ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
++ mem_ctx,
++ #endif
++ &(res.res.resProperty.lpProp), &sprop);
+
+ exchange_mapi_connection_fetch_items (priv->fid, &res, NULL,
+ req_props_list, G_N_ELEMENTS (req_props_list),
+ NULL, NULL,
+ capture_req_props, cbdata,
+ MAPI_OPTIONS_FETCH_GENERIC_STREAMS);
++
++ talloc_free (mem_ctx);
+ }
+
+ static icaltimezone *e_cal_backend_mapi_internal_get_timezone (ECalBackend *backend, const char *tzid);
+
+=== modified file 'src/camel/camel-mapi-folder.c'
+--- a/src/camel/camel-mapi-folder.c 2010-06-02 11:18:18 +0000
++++ b/src/camel/camel-mapi-folder.c 2010-09-02 00:30:36 +0000
+@@ -1039,6 +1039,7 @@
+ gboolean is_locked = FALSE;
+ gboolean status;
+
++ TALLOC_CTX *mem_ctx = NULL;
+ struct mapi_SRestriction *res = NULL;
+ struct SSortOrderSet *sort = NULL;
+ struct mapi_update_deleted_msg *deleted_items_op_msg;
+@@ -1081,6 +1082,7 @@
+ struct SPropValue sprop;
+ struct timeval t;
+
++ mem_ctx = talloc_init ("ExchangeMAPI_mapi_refresh_folder");
+ res = g_new0 (struct mapi_SRestriction, 1);
+ res->rt = RES_PROPERTY;
+ /*RELOP_GE acts more like >=. Few extra items are being fetched.*/
+@@ -1092,7 +1094,11 @@
+
+ //Creation time ?
+ set_SPropValue_proptag_date_timeval (&sprop, PR_LAST_MODIFICATION_TIME, &t);
+- cast_mapi_SPropValue (&(res->res.resProperty.lpProp), &sprop);
++ cast_mapi_SPropValue (
++ #ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
++ mem_ctx,
++ #endif
++ &(res->res.resProperty.lpProp), &sprop);
+
+ }
+
+=== modified file 'src/libexchangemapi/exchange-mapi-cal-utils.c'
+--- a/src/libexchangemapi/exchange-mapi-cal-utils.c 2010-06-08 07:42:42 +0000
++++ b/src/libexchangemapi/exchange-mapi-cal-utils.c 2010-09-02 00:30:36 +0000
+@@ -312,7 +312,7 @@
+ set_SPropValue_proptag (&(recipient->in.req_lpProps[0]), PR_SEND_INTERNET_ENCODING, (const void *)&val);
+
+ val = RECIP_SENDABLE | RECIP_ORGANIZER;
+- set_SPropValue_proptag (&(recipient->in.req_lpProps[1]), PR_RECIPIENTS_FLAGS, (const void *)&val);
++ set_SPropValue_proptag (&(recipient->in.req_lpProps[1]), PR_RECIPIENT_FLAGS, (gconstpointer )&val);
+
+ val = olResponseNone;
+ set_SPropValue_proptag (&(recipient->in.req_lpProps[2]), PR_RECIPIENT_TRACKSTATUS, (const void *)&val);
+@@ -384,7 +384,7 @@
+ set_SPropValue_proptag (&(recipient->in.req_lpProps[0]), PR_SEND_INTERNET_ENCODING, (const void *)&val);
+
+ val = RECIP_SENDABLE | (!g_ascii_strcasecmp(str, org) ? RECIP_ORGANIZER : 0);
+- set_SPropValue_proptag (&(recipient->in.req_lpProps[1]), PR_RECIPIENTS_FLAGS, (const void *)&val);
++ set_SPropValue_proptag (&(recipient->in.req_lpProps[1]), PR_RECIPIENT_FLAGS, (gconstpointer )&val);
+
+ param = icalproperty_get_first_parameter (att_prop, ICAL_PARTSTAT_PARAMETER);
+ val = get_trackstatus_from_partstat (icalparameter_get_partstat(param));
+@@ -493,7 +493,7 @@
+ else
+ continue;
+
+- flags = (const uint32_t *) get_SPropValue_SRow_data (&recip->out_SRow, PR_RECIPIENTS_FLAGS);
++ flags = (const uint32_t *) get_SPropValue_SRow_data (&recip->out_SRow, PR_RECIPIENT_FLAGS);
+
+ if (flags && (*flags & RECIP_ORGANIZER)) {
+ prop = icalproperty_new_organizer (val);
+@@ -1238,6 +1238,7 @@
+ uint32_t proptag = 0x0;
+ struct SPropTagArray *array;
+ GSList *ids = NULL, *l;
++ TALLOC_CTX *mem_ctx;
+ mapi_id_t fid;
+
+ *mid = 0;
+@@ -1254,8 +1255,16 @@
+
+ sb = (const struct SBinary *)find_mapi_SPropValue_data(properties, PROP_TAG(PT_BINARY, 0x0023));
+
++ mem_ctx = talloc_init("ExchangeMAPI check_server_for_object");
++
+ set_SPropValue_proptag (&sprop, proptag, (const void *) sb);
+- cast_mapi_SPropValue (&(res.res.resProperty.lpProp), &sprop);
++ cast_mapi_SPropValue (
++#ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
++ mem_ctx,
++#endif
++ &(res.res.resProperty.lpProp), &sprop);
++
++ talloc_free(mem_ctx);
+
+ ids = exchange_mapi_util_check_restriction (fid, &res);
+
+@@ -2165,15 +2174,23 @@
+ id = g_random_int ();
+ if (id) {
+ GSList *ids = NULL;
++ TALLOC_CTX *mem_ctx;
+ set_SPropValue_proptag (&sprop, PR_OWNER_APPT_ID, (const void *) &id);
+- cast_mapi_SPropValue (&(res.res.resProperty.lpProp), &sprop);
+- ids = exchange_mapi_util_check_restriction (fid, &res);
++ mem_ctx = talloc_init ("ExchangeMAPI_get_new_appt_id");
++
++ cast_mapi_SPropValue (
++ #ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
++ mem_ctx,
++ #endif
++ &(res.res.resProperty.lpProp), &sprop);
+ if (ids) {
+ GSList *l;
+ for (l = ids; l; l = l->next)
+ g_free (l->data);
+ } else
+ found = TRUE;
++
++ talloc_free (mem_ctx);
+ }
+ };
+
+
+=== modified file 'src/libexchangemapi/exchange-mapi-connection.c'
+--- a/src/libexchangemapi/exchange-mapi-connection.c 2010-05-24 16:20:35 +0000
++++ b/src/libexchangemapi/exchange-mapi-connection.c 2010-09-02 00:30:36 +0000
+@@ -762,7 +762,12 @@
+ attachment->cValues = properties.cValues;
+ attachment->lpProps = g_new0 (struct SPropValue, attachment->cValues + 1);
+ for (z=0; z < properties.cValues; z++)
+- cast_SPropValue (&properties.lpProps[z], &(attachment->lpProps[z]));
++ cast_SPropValue (
++ #ifdef HAVE_MEMCTX_ON_CAST_SPROPVALUE
++ mem_ctx,
++ #endif
++ &properties.lpProps[z], &(attachment->lpProps[z]));
++
+
+ /* just to get all the other streams */
+ for (z=0; z < properties.cValues; z++) {
+@@ -1368,8 +1373,11 @@
+ prop_count + 1);
+ properties_array.cValues = prop_count;
+ for (k=0; k < prop_count; k++)
+- cast_mapi_SPropValue(&properties_array.lpProps[k], &lpProps[k]);
+-
++ cast_mapi_SPropValue (
++ #ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
++ mem_ctx,
++ #endif
++ &properties_array.lpProps[k], &lpProps[k]);
+ } else
+ retval = GetPropsAll (&obj_message, &properties_array);
+ relax:
+@@ -1510,6 +1518,7 @@
+
+ GetPropsTagArray->cValues = (cn_props + NamedPropsTagArray->cValues);
+ GetPropsTagArray->aulPropTag = talloc_array(mem_ctx, uint32_t, (cn_props + NamedPropsTagArray->cValues));
++ GetPropsTagArray->aulPropTag = (enum MAPITAGS *) talloc_zero_array (mem_ctx, uint32_t, GetPropsTagArray->cValues + 1);
+
+ for (m = 0; m < NamedPropsTagArray->cValues; m++, n++)
+ GetPropsTagArray->aulPropTag[n] = NamedPropsTagArray->aulPropTag[m];
+@@ -1553,7 +1562,11 @@
+ properties_array.cValues = prop_count;
+ properties_array.lpProps = talloc_zero_array (mem_ctx, struct mapi_SPropValue, prop_count + 1);
+ for (k=0; k < prop_count; k++)
+- cast_mapi_SPropValue(&properties_array.lpProps[k], &lpProps[k]);
++ cast_mapi_SPropValue (
++ #ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
++ mem_ctx,
++ #endif
++ &properties_array.lpProps[k], &lpProps[k]);
+
+ } else
+ retval = GetPropsAll (&obj_message, &properties_array);
+@@ -3176,11 +3189,11 @@
+ {
+ gboolean retval;
+
+- LOCK();
++ LOCK ();
+ #ifdef HAVE_CORRECT_REGISTERNOTIFICATION
+ retval = RegisterNotification (global_mapi_session, 0) == MAPI_E_SUCCESS;
+ #else
+- retval = RegisterNotification (0) == MAPI_E_SUCCESS;
++ retval = FALSE;
+ #endif
+ UNLOCK();
+
+
Added: experimental/evolution-mapi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-mapi/debian/patches/series?rev=1719&op=file
==============================================================================
--- experimental/evolution-mapi/debian/patches/series (added)
+++ experimental/evolution-mapi/debian/patches/series Tue Sep 7 12:53:59 2010
@@ -1,0 +1,1 @@
+newer-openchange.patch
More information about the pkg-evolution-commits
mailing list