evolution-mapi r17 - in trunk: . src/calendar src/libexchangemapi

[msuman svn gnome org]

Author: msuman
Date: Fri Nov 28 08:14:51 2008
New Revision: 17
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=17&view=rev

Log:
Calendar backends now provide CAL_STATIC_CAPABILITY_CREATE_MESSAGES, minimum required version of evolution-data-server and evolution bumped to 2.25.2

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/calendar/ChangeLog
   trunk/src/calendar/e-cal-backend-mapi.c
   trunk/src/libexchangemapi/ChangeLog
   trunk/src/libexchangemapi/exchange-mapi-connection.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Nov 28 08:14:51 2008
@@ -14,8 +14,8 @@
 EDS_PACKAGE=1.2
 
 # Required Packages
-m4_define([eds_minimum_version], [2.24.0])
-m4_define([evo_minimum_version], [2.24.0])
+m4_define([eds_minimum_version], [2.25.2])
+m4_define([evo_minimum_version], [2.25.2])
 m4_define([libmapi_minimum_version], [0.8])
 
 AC_CONFIG_HEADER(config.h)

Modified: trunk/src/calendar/e-cal-backend-mapi.c
==============================================================================
--- trunk/src/calendar/e-cal-backend-mapi.c	(original)
+++ trunk/src/calendar/e-cal-backend-mapi.c	Fri Nov 28 08:14:51 2008
@@ -298,7 +298,7 @@
 //				CAL_STATIC_CAPABILITY_NO_TRANSPARENCY ","
 //				CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ATTEND ","
 //				CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS ","
-//				CAL_STATIC_CAPABILITY_CREATE_MESSAGES ","
+				CAL_STATIC_CAPABILITY_CREATE_MESSAGES ","
 //				CAL_STATIC_CAPABILITY_SAVE_SCHEDULES ","
 				CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK ","
 				CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR ","

Modified: trunk/src/libexchangemapi/exchange-mapi-connection.c
==============================================================================
--- trunk/src/libexchangemapi/exchange-mapi-connection.c	(original)
+++ trunk/src/libexchangemapi/exchange-mapi-connection.c	Fri Nov 28 08:14:51 2008
@@ -829,6 +829,9 @@
 
 	g_assert (count == FlagList->cValues);
 
+	if (!SRowSet) /* This happens when there are ZERO RESOLVED recipients */
+		SRowSet = talloc_zero(mem_ctx, struct SRowSet);
+
 	for (i = 0, l = recipients, j = 0; (i < count && l != NULL); ++i, l = l->next) {
 		ExchangeMAPIRecipient *recipient = (ExchangeMAPIRecipient *)(l->data);
 		uint32_t last;
@@ -839,12 +842,7 @@
 			g_warning ("\n%s:%d %s() - '%s' is ambiguous ", __FILE__, __LINE__, __PRETTY_FUNCTION__, recipient->email_id);
 		} else if (FlagList->aulPropTag[i] == MAPI_UNRESOLVED) {
 			/* If the recipient is unresolved, consider it is a SMTP one */
-			if (SRowSet) {
-				SRowSet->aRow = talloc_realloc(mem_ctx, SRowSet->aRow, struct SRow, SRowSet->cRows + 1);
-			} else {
-				SRowSet = talloc_zero(mem_ctx, struct SRowSet);
-				SRowSet->aRow = talloc_zero(mem_ctx, struct SRow);
-			}
+			SRowSet->aRow = talloc_realloc(mem_ctx, SRowSet->aRow, struct SRow, SRowSet->cRows + 1);
 			last = SRowSet->cRows;
 			SRowSet->aRow[last].cValues = 0;
 			SRowSet->aRow[last].lpProps = talloc_zero(mem_ctx, struct SPropValue);