[evolution-mapi] Bug #618504 - Meeting request mails are shown as plain text

[Milan Crha <mcrha src gnome org>]

commit 7333e2ce13b5bb9d5c9b3cb10486ab020ae98dd3
Author: Milan Crha <mcrha redhat com>
Date:   Thu May 13 12:11:15 2010 +0200

    Bug #618504 - Meeting request mails are shown as plain text

 src/libexchangemapi/exchange-mapi-cal-utils.c  |    2 +-
 src/libexchangemapi/exchange-mapi-connection.c |    9 +++------
 src/libexchangemapi/exchange-mapi-connection.h |    2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/libexchangemapi/exchange-mapi-cal-utils.c b/src/libexchangemapi/exchange-mapi-cal-utils.c
index f329b88..f059e17 100644
--- a/src/libexchangemapi/exchange-mapi-cal-utils.c
+++ b/src/libexchangemapi/exchange-mapi-cal-utils.c
@@ -1368,7 +1368,7 @@ exchange_mapi_cal_util_camel_helper (ExchangeMapiConnection *conn, mapi_id_t ori
 		return NULL;
 
 	if (obj_message)
-		exchange_mapi_connection_fetch_object_props (conn, NULL, orig_fid, obj_message,
+		exchange_mapi_connection_fetch_object_props (conn, NULL, orig_fid, orig_mid, obj_message,
 					exchange_mapi_cal_utils_get_props_cb, GINT_TO_POINTER (fccd.kind),
 					fetch_camel_cal_comp_cb, &fccd,
 					MAPI_OPTIONS_FETCH_ALL);
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index e6dba42..e047e7f 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -815,7 +815,7 @@ obj_message_to_camel_mime (ExchangeMapiConnection *conn, mapi_id_t fid, mapi_obj
 	g_return_val_if_fail (conn != NULL, NULL);
 	g_return_val_if_fail (obj_msg != NULL, NULL);
 
-	if (!exchange_mapi_connection_fetch_object_props (conn, NULL, fid, obj_msg, mapi_mail_get_item_prop_list, NULL,
+	if (!exchange_mapi_connection_fetch_object_props (conn, NULL, fid, 0, obj_msg, mapi_mail_get_item_prop_list, NULL,
 					fetch_props_to_mail_item_cb, &item,
 					MAPI_OPTIONS_FETCH_ALL | MAPI_OPTIONS_GETBESTBODY)
 	    || item == NULL) {
@@ -1588,7 +1588,7 @@ exchange_mapi_connection_fetch_items   (ExchangeMapiConnection *conn, mapi_id_t
 
 /* obj_folder and obj_message are released only when obj_folder is not NULL and when returned TRUE */
 gboolean
-exchange_mapi_connection_fetch_object_props (ExchangeMapiConnection *conn, mapi_object_t *obj_folder, mapi_id_t fid, mapi_object_t *obj_message,
+exchange_mapi_connection_fetch_object_props (ExchangeMapiConnection *conn, mapi_object_t *obj_folder, mapi_id_t fid, mapi_id_t mid, mapi_object_t *obj_message,
 				     BuildReadPropsCB build_props, gpointer brp_data,
 				     FetchCallback cb, gpointer data,
 				     guint32 options)
@@ -1601,7 +1601,6 @@ exchange_mapi_connection_fetch_object_props (ExchangeMapiConnection *conn, mapi_
 	GSList *recip_list = NULL;
 	GSList *stream_list = NULL;
 	gboolean result = FALSE;
-	mapi_id_t mid;
 
 	CHECK_CORRECT_CONN_AND_GET_PRIV (conn, FALSE);
 	g_return_val_if_fail (priv->session != NULL, FALSE);
@@ -1659,8 +1658,6 @@ exchange_mapi_connection_fetch_object_props (ExchangeMapiConnection *conn, mapi_
 		mapi_SPropValue_array_named (obj_message, &properties_array);
 	}
 
-	mid = mapi_object_get_id (obj_message);
-
 	/* Release the objects so that the callback may use the store. */
 	if (obj_folder) {
 		/* obj_folder is not NULL, thus can do this */
@@ -1741,7 +1738,7 @@ exchange_mapi_connection_fetch_item (ExchangeMapiConnection *conn, mapi_id_t fid
 		goto cleanup;
 	}
 
-	result = exchange_mapi_connection_fetch_object_props (conn, &obj_folder, fid, &obj_message, build_props, brp_data, cb, data, options);
+	result = exchange_mapi_connection_fetch_object_props (conn, &obj_folder, fid, mid, &obj_message, build_props, brp_data, cb, data, options);
 
 cleanup:
 	if (!result) {
diff --git a/src/libexchangemapi/exchange-mapi-connection.h b/src/libexchangemapi/exchange-mapi-connection.h
index 42e3c0e..8ddd3b4 100644
--- a/src/libexchangemapi/exchange-mapi-connection.h
+++ b/src/libexchangemapi/exchange-mapi-connection.h
@@ -155,7 +155,7 @@ gboolean		exchange_mapi_connection_close (ExchangeMapiConnection *conn);
 gboolean		exchange_mapi_connection_connected (ExchangeMapiConnection *conn);
 
 gboolean		exchange_mapi_connection_fetch_object_props (
-					ExchangeMapiConnection *conn, mapi_object_t *obj_folder, mapi_id_t fid, mapi_object_t *obj_message,
+					ExchangeMapiConnection *conn, mapi_object_t *obj_folder, mapi_id_t fid, mapi_id_t mid, mapi_object_t *obj_message,
 					BuildReadPropsCB build_props, gpointer brp_data,
 					FetchCallback cb, gpointer data,
 					guint32 options);