[evolution-mapi] Fix GAL contacts to not display LDAP_DN as name.

[Bharath Acharya <abharath src gnome org>]

commit df22c6b21bcbbe15109ddee1621736b8c4d2c807
Author: Bharath Acharya <abharath novell com>
Date:   Wed Jun 16 20:45:04 2010 +0530

    Fix GAL contacts to not display LDAP_DN as name.

 src/addressbook/e-book-backend-mapi-utils.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi-utils.c b/src/addressbook/e-book-backend-mapi-utils.c
index 1177c42..8dea215 100644
--- a/src/addressbook/e-book-backend-mapi-utils.c
+++ b/src/addressbook/e-book-backend-mapi-utils.c
@@ -61,7 +61,7 @@ static const struct field_element_mapping {
 	{ E_CONTACT_UID, PT_UNICODE, 0, ELEMENT_TYPE_SIMPLE},
 	{ E_CONTACT_REV, PT_SYSTIME, PR_LAST_MODIFICATION_TIME, ELEMENT_TYPE_SIMPLE},
 
-	{ E_CONTACT_FILE_AS, PT_UNICODE, PR_EMS_AB_MANAGER_T_UNICODE, ELEMENT_TYPE_SIMPLE},
+	{ E_CONTACT_FILE_AS, PT_UNICODE, PidLidFileUnder, ELEMENT_TYPE_SIMPLE | ELEMENT_TYPE_NAMEDID},
 	{ E_CONTACT_FULL_NAME, PT_UNICODE, PR_DISPLAY_NAME_UNICODE, ELEMENT_TYPE_SIMPLE },
 	{ E_CONTACT_GIVEN_NAME, PT_UNICODE, PR_GIVEN_NAME_UNICODE, ELEMENT_TYPE_SIMPLE},
 	{ E_CONTACT_FAMILY_NAME, PT_UNICODE, PR_SURNAME_UNICODE, ELEMENT_TYPE_SIMPLE},
@@ -140,7 +140,6 @@ mapi_book_utils_get_prop_list (ExchangeMapiConnection *conn, mapi_id_t fid, TALL
 		PR_DEPARTMENT_NAME_UNICODE,
 		PR_DISPLAY_NAME_UNICODE,
 		PR_SMTP_ADDRESS_UNICODE, /* used in GAL */
-		PR_EMS_AB_MANAGER_T_UNICODE,
 		PR_FID,
 		PR_GIVEN_NAME_UNICODE,
 		PR_HASATTACH,
@@ -199,6 +198,8 @@ mapi_book_utils_get_prop_list (ExchangeMapiConnection *conn, mapi_id_t fid, TALL
 		{ PidLidDistributionListMembers, 0 },
 		{ PidLidDistributionListChecksum, 0 },
 
+		{ PidLidFileUnder, 0 },
+
 		{ PidLidEmail1OriginalDisplayName, 0 },
 		{ PidLidEmail2OriginalDisplayName, 0 },
 		{ PidLidEmail3OriginalDisplayName, 0 },