[evolution-mapi] Follow-up fix for breakness after changes for bug #622695

[Milan Crha <mcrha src gnome org>]

commit 5a0708d9e3d384ea70844a0c4965f037bbab06ee
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jul 15 13:44:44 2010 +0200

    Follow-up fix for breakness after changes for bug #622695

 src/calendar/e-cal-backend-mapi.c              |    2 +-
 src/libexchangemapi/exchange-mapi-connection.c |   22 ++++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
index d71bf93..3b6895f 100644
--- a/src/calendar/e-cal-backend-mapi.c
+++ b/src/calendar/e-cal-backend-mapi.c
@@ -1399,7 +1399,7 @@ e_cal_backend_mapi_connect (ECalBackendMAPI *cbmapi, GError **perror)
 	}
 
 	/* We have established a connection */
-	if (priv->cache && priv->fid) {
+	if (priv->cache && priv->fid && e_cal_backend_cache_get_marker (priv->cache)) {
 		priv->mode = CAL_MODE_REMOTE;
 		if (priv->mode_changed && !priv->dthread) {
 			priv->mode_changed = FALSE;
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index c3c6e44..ffb11c5 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -1645,20 +1645,17 @@ exchange_mapi_connection_fetch_items   (ExchangeMapiConnection *conn, mapi_id_t
 			}
 
 			if (has_attach && *has_attach && (MAPI_OPTIONS_FETCH_ATTACHMENTS & options)) {
-				if (!exchange_mapi_util_get_attachments (conn, fid, &obj_message, &attach_list, perror))
-					goto loop_cleanup;
+				exchange_mapi_util_get_attachments (conn, fid, &obj_message, &attach_list, NULL);
 			}
 
 			if (options & MAPI_OPTIONS_FETCH_RECIPIENTS) {
-				if (!exchange_mapi_util_get_recipients (&obj_message, &recip_list, perror))
-					goto loop_cleanup;
+				exchange_mapi_util_get_recipients (&obj_message, &recip_list, perror);
 			}
 
 			/* get the main body stream no matter what */
 			if (options & MAPI_OPTIONS_FETCH_BODY_STREAM) {
-				if (!exchange_mapi_util_read_body_stream (&obj_message, &stream_list,
-								     options & MAPI_OPTIONS_GETBESTBODY, perror))
-					goto loop_cleanup;
+				exchange_mapi_util_read_body_stream (&obj_message, &stream_list,
+								     options & MAPI_OPTIONS_GETBESTBODY, NULL);
 			}
 
 			if (propsTagArray && propsTagArray->cValues) {
@@ -1804,21 +1801,18 @@ exchange_mapi_connection_fetch_object_props (ExchangeMapiConnection *conn, mapi_
 
 	/* Fetch attachments */
 	if (options & MAPI_OPTIONS_FETCH_ATTACHMENTS) {
-		if (!exchange_mapi_util_get_attachments (conn, fid, obj_message, &attach_list, perror))
-			goto cleanup;
+		exchange_mapi_util_get_attachments (conn, fid, obj_message, &attach_list, NULL);
 	}
 
 	/* Fetch recipients */
 	if (options & MAPI_OPTIONS_FETCH_RECIPIENTS) {
-		if (!exchange_mapi_util_get_recipients (obj_message, &recip_list, perror))
-			goto cleanup;
+		exchange_mapi_util_get_recipients (obj_message, &recip_list, NULL);
 	}
 
 	/* get the main body stream no matter what */
 	if (options & MAPI_OPTIONS_FETCH_BODY_STREAM) {
-		if (!exchange_mapi_util_read_body_stream (obj_message, &stream_list,
-			options & MAPI_OPTIONS_GETBESTBODY, perror))
-			goto cleanup;
+		exchange_mapi_util_read_body_stream (obj_message, &stream_list,
+			options & MAPI_OPTIONS_GETBESTBODY, NULL);
 	}
 
 	if (propsTagArray && propsTagArray->cValues) {