evolution-data-server r9426 - branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi

[msuman svn gnome org]

Author: msuman
Date: Fri Aug 22 04:11:48 2008
New Revision: 9426
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9426&view=rev

Log:
Ashish Shrivastava  <shashish novell com>: Fix the broken contact creation.

Modified:
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/e-book-backend-mapi.c

Modified: branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/e-book-backend-mapi.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/e-book-backend-mapi.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/addressbook/backends/mapi/e-book-backend-mapi.c	Fri Aug 22 04:11:48 2008
@@ -348,23 +348,22 @@
 {
 	EContact *contact = data;
 	
-	mapi_nameid_OOM_add(nameid, "FileAs", PSETID_Address);
+	mapi_nameid_lid_add(nameid, 0x8005, PSETID_Address);
 	mapi_nameid_lid_add(nameid, 0x8084, PSETID_Address);
-	mapi_nameid_OOM_add(nameid, "Email1Address", PSETID_Address);
+	mapi_nameid_lid_add(nameid, 0x8083, PSETID_Address);
 
 	mapi_nameid_lid_add(nameid, 0x8093, PSETID_Address);
 	mapi_nameid_lid_add(nameid, 0x80A3, PSETID_Address);
 	
 	mapi_nameid_string_add(nameid, "urn:schemas:contacts:fileas", PS_PUBLIC_STRINGS);
 
-	mapi_nameid_OOM_add(nameid, "WebPage", PSETID_Address);
-	mapi_nameid_OOM_add(nameid, "IMAddress", PSETID_Address);
+	mapi_nameid_lid_add(nameid, 0x802B, PSETID_Address);
+	mapi_nameid_lid_add(nameid, 0x8062, PSETID_Address);
 
-	mapi_nameid_OOM_add(nameid, "HomeAddress", PSETID_Address);	
-	mapi_nameid_OOM_add(nameid, "BusinessAddress", PSETID_Address);
+	mapi_nameid_lid_add(nameid, 0x801A, PSETID_Address);	
+	mapi_nameid_lid_add(nameid, 0x801B, PSETID_Address);
 
-	// FIXME : Patch has to go into libmapi.
-	//	mapi_nameid_lid_add(nameid, 0x3A4F, PS_MAPI);
+	mapi_nameid_lid_add(nameid, 0x3A4F, PS_MAPI);
 
 	mapi_nameid_lid_add(nameid, 0x8094, PSETID_Address);
 	mapi_nameid_lid_add(nameid, 0x80A4, PSETID_Address);
@@ -392,16 +391,16 @@
 	set_SPropValue_proptag(&props[i++], PR_MESSAGE_CLASS, (const void *)IPM_CONTACT);
 	set_str_value (E_CONTACT_FILE_AS, PR_NORMALIZED_SUBJECT);
 	set_str_value (E_CONTACT_EMAIL_1,  SPropTagArray->aulPropTag[1]);
-	set_str_value (E_CONTACT_EMAIL_1,  SPropTagArray->aulPropTag[2]);
+//	set_str_value (E_CONTACT_EMAIL_1,  SPropTagArray->aulPropTag[2]);
 	set_str_value (E_CONTACT_FILE_AS,  SPropTagArray->aulPropTag[5]);
 
 	
 //	set_str_value ( E_CONTACT_EMAIL_1, 0x8083001e);
 	set_str_value ( E_CONTACT_EMAIL_2, SPropTagArray->aulPropTag[3]);
-	set_str_value ( E_CONTACT_EMAIL_2, SPropTagArray->aulPropTag[11]);
+//	set_str_value ( E_CONTACT_EMAIL_2, SPropTagArray->aulPropTag[11]);
 	
 	set_str_value ( E_CONTACT_EMAIL_3, SPropTagArray->aulPropTag[4]);
-	set_str_value ( E_CONTACT_EMAIL_3, SPropTagArray->aulPropTag[12]);
+//	set_str_value ( E_CONTACT_EMAIL_3, SPropTagArray->aulPropTag[12]);
 	
 	set_str_value (E_CONTACT_HOMEPAGE_URL, SPropTagArray->aulPropTag[6]);
 	set_str_value (E_CONTACT_FREEBUSY_URL, 0x812C001E);
@@ -500,7 +499,7 @@
 
 	if (e_contact_get (contact, E_CONTACT_NICKNAME)) {
 		char *nick  = e_contact_get (contact, E_CONTACT_NICKNAME);
-		set_SPropValue_proptag (&props[i++], SPropTagArray->aulPropTag[10], nick);
+//		set_SPropValue_proptag (&props[i++], SPropTagArray->aulPropTag[10], nick);
 		printf("nickname %s %x\n", nick,  SPropTagArray->aulPropTag[10]);
 	}