From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 10 Jan 2016 21:42:25 +0000 (+0000)
Subject: Updated GEO support for ContactDataObject.
X-Git-Tag: release-0.09~65
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=0787fd24bf5d1269924578c42442f71650efeccc;p=xestiaab%2F.git

Updated GEO support for ContactDataObject.
---

diff --git a/source/contacteditor/cdo/ContactDataObject.cpp b/source/contacteditor/cdo/ContactDataObject.cpp
index e715a2d..5085409 100644
--- a/source/contacteditor/cdo/ContactDataObject.cpp
+++ b/source/contacteditor/cdo/ContactDataObject.cpp
@@ -2468,9 +2468,21 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
+	
+	wxStringTokenizer GeoSplitData(PropertySeg2, wxT(":"));
 		
-	GeopositionList->insert(std::make_pair(*GeographicCount, PropertySeg2));
+	if (GeoSplitData.CountTokens() > 1){
+
+		GeopositionListDataType->insert(std::make_pair(*GeographicCount, GeoSplitData.GetNextToken()));			
+		GeopositionList->insert(std::make_pair(*GeographicCount, GeoSplitData.GetString()));
+	
+	} else {
 	
+		GeopositionList->insert(std::make_pair(*GeographicCount, PropertySeg2));
+		GeopositionListDataType->insert(std::make_pair(*GeographicCount, "tel"));
+	
+	}
+		
 	// Add the name token data.
 	
 	if (!PropertyTokens.IsEmpty()){