X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2Fcdo%2FContactDataObject.cpp;h=667c8df28b4bcaec9f12bb3eaac4bd0c5e5a84c5;hb=04a1ebb415bc0291b376d649d0d1ff680f4c6c7c;hp=cda6933e4572d5f30166ffc1ded678b6ca07124d;hpb=adc92a22d0a1313dceb6e17b68263fe657933f30;p=xestiaab%2F.git

diff --git a/source/contacteditor/cdo/ContactDataObject.cpp b/source/contacteditor/cdo/ContactDataObject.cpp
index cda6933..667c8df 100644
--- a/source/contacteditor/cdo/ContactDataObject.cpp
+++ b/source/contacteditor/cdo/ContactDataObject.cpp
@@ -1586,7 +1586,15 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 		ProcessNameValue(&PropertyData, &PropertyName, &PropertyValue);
 		intPrevValue = intiter->second;
 		
-		CaptureString(&PropertyValue, FALSE);
+		if (PropertyName == "GEO"){
+		
+			CaptureString(&PropertyValue, TRUE); 
+		
+		} else {
+		
+			CaptureString(&PropertyValue, FALSE); 			
+		
+		}
 		
 		// Process properties.
 		
@@ -2381,6 +2389,7 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 	std::map<int, wxString> *GeopositionListPID = NULL;
 	std::map<int, wxString> *GeopositionListTokens = NULL;
 	std::map<int, wxString> *GeopositionListMediatype = NULL;
+	std::map<int, wxString> *GeopositionListDataType = NULL;
 	std::map<int, int> *GeopositionListPref = NULL;
 
 	switch(PropType){
@@ -2391,6 +2400,7 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListPID = &GeneralGeographyListPID;
 			GeopositionListTokens = &GeneralGeographyListTokens;
 			GeopositionListMediatype = &GeneralGeographyListMediatype;
+			GeopositionListDataType = &GeneralGeographyListDataType;
 			GeopositionListPref = &GeneralGeographyListPref;	
 			break;
 		case PROPERTY_HOME:
@@ -2400,6 +2410,7 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListPID = &HomeGeographyListPID;
 			GeopositionListTokens = &HomeGeographyListTokens;
 			GeopositionListMediatype = &HomeGeographyListMediatype;
+			GeopositionListDataType = &HomeGeographyListDataType;
 			GeopositionListPref = &HomeGeographyListPref;	
 			break;
 		case PROPERTY_WORK:
@@ -2408,7 +2419,8 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListAltID = &BusinessGeographyListAltID;
 			GeopositionListPID = &BusinessGeographyListPID;
 			GeopositionListTokens = &BusinessGeographyListTokens;
-			GeopositionListMediatype = &BusinessGeographyListMediatype;	
+			GeopositionListMediatype = &BusinessGeographyListMediatype;
+			GeopositionListDataType = &BusinessGeographyListDataType;
 			GeopositionListPref = &BusinessGeographyListPref;
 			break;
 	}