[evolution-mapi] Bug #668641 - Doesn't fetch mails with Exchange 2010 server

[Milan Crha <mcrha src gnome org>]

commit e70c22badd02b4ad225fc0103a8494fe2e087b91
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jan 27 09:53:54 2012 +0100

    Bug #668641 - Doesn't fetch mails with Exchange 2010 server

 src/account-setup-eplugin/e-mapi-search-gal-user.c |    3 ++-
 src/libexchangemapi/e-mapi-connection.c            |   12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/account-setup-eplugin/e-mapi-search-gal-user.c b/src/account-setup-eplugin/e-mapi-search-gal-user.c
index dc3ac5e..81ccedd 100644
--- a/src/account-setup-eplugin/e-mapi-search-gal-user.c
+++ b/src/account-setup-eplugin/e-mapi-search-gal-user.c
@@ -292,7 +292,8 @@ list_gal_search_mids_cb (EMapiConnection *conn,
 	g_return_val_if_fail (object_data != NULL, FALSE);
 	g_return_val_if_fail (user_data != NULL, FALSE);
 
-	if (object_data->obj_type == MAPI_MAILUSER) {
+	/* zero means PidTagObjectType not found or supported */
+	if (object_data->obj_type == MAPI_MAILUSER || object_data->obj_type == 0) {
 		GSList **pmids = user_data;
 		mapi_id_t *mid;
 
diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c
index 5bed659..f83eeee 100644
--- a/src/libexchangemapi/e-mapi-connection.c
+++ b/src/libexchangemapi/e-mapi-connection.c
@@ -1858,12 +1858,12 @@ e_mapi_connection_list_objects (EMapiConnection *conn,
 		goto cleanup;
 	}
 
-	propTagArray = set_SPropTagArray (mem_ctx, 0x5,
-					  PidTagMid,
-					  PidTagObjectType,
-					  PidTagMessageClass,
-					  PidTagMessageFlags,
-					  PidTagLastModificationTime);
+	propTagArray = set_SPropTagArray (mem_ctx, 4,
+		PidTagMid,
+		PidTagMessageClass,
+		PidTagMessageFlags,
+		PidTagLastModificationTime);
+		/* PidTagObjectType doesn't work with Exchange 2010 servers */
 
 	/* Set primary columns to be fetched */
 	ms = SetColumns (&obj_table, propTagArray);