[evolution-mapi] PR_RECIPIENTS_FLAGS renamed to PR_RECIPIENT_FLAGS in openchange

[Milan Crha <mcrha src gnome org>]

commit 7ac51f481dd1c6968d889c424bea183068c073ae
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jul 16 12:22:35 2010 +0200

    PR_RECIPIENTS_FLAGS renamed to PR_RECIPIENT_FLAGS in openchange

 configure.ac                                  |   18 ++++++++++++++++++
 src/calendar/e-cal-backend-mapi.c             |    2 +-
 src/libexchangemapi/exchange-mapi-cal-utils.c |    6 +++---
 3 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 62c3362..3876f27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,6 +235,24 @@ 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
 dnl ****************************
 API_VERSION=$EDS_PACKAGE
diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
index 3b6895f..7d873b3 100644
--- a/src/calendar/e-cal-backend-mapi.c
+++ b/src/calendar/e-cal-backend-mapi.c
@@ -631,7 +631,7 @@ mapi_cal_get_known_ids (ExchangeMapiConnection *conn, mapi_id_t fid, TALLOC_CTX
 		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,
diff --git a/src/libexchangemapi/exchange-mapi-cal-utils.c b/src/libexchangemapi/exchange-mapi-cal-utils.c
index bfd72bb..64239e6 100644
--- a/src/libexchangemapi/exchange-mapi-cal-utils.c
+++ b/src/libexchangemapi/exchange-mapi-cal-utils.c
@@ -312,7 +312,7 @@ exchange_mapi_cal_util_fetch_organizer (ECalComponent *comp, GSList **recip_list
 		set_SPropValue_proptag (&(recipient->in.req_lpProps[0]), PR_SEND_INTERNET_ENCODING, (gconstpointer )&val);
 
 		val = RECIP_SENDABLE | RECIP_ORGANIZER;
-		set_SPropValue_proptag (&(recipient->in.req_lpProps[1]), PR_RECIPIENTS_FLAGS, (gconstpointer )&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, (gconstpointer )&val);
@@ -384,7 +384,7 @@ exchange_mapi_cal_util_fetch_recipients (ECalComponent *comp, GSList **recip_lis
 		set_SPropValue_proptag (&(recipient->in.req_lpProps[0]), PR_SEND_INTERNET_ENCODING, (gconstpointer )&val);
 
 		val = RECIP_SENDABLE | (!g_ascii_strcasecmp(str, org) ? RECIP_ORGANIZER : 0);
-		set_SPropValue_proptag (&(recipient->in.req_lpProps[1]), PR_RECIPIENTS_FLAGS, (gconstpointer )&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 @@ ical_attendees_from_props (icalcomponent *ical_comp, GSList *recipients, gboolea
 		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);