From 20c258c0cc4524fada364e6fc2abd23852c7cd76 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 10 Jan 2016 19:32:54 +0000
Subject: [PATCH] Added DataType to the Geoposition variables in
 ContactDataObject.

---
 source/contacteditor/cdo/ContactDataObject.cpp | 5 ++++-
 source/contacteditor/cdo/ContactDataObject.h   | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/contacteditor/cdo/ContactDataObject.cpp b/source/contacteditor/cdo/ContactDataObject.cpp
index afa3a42..5c625c1 100644
--- a/source/contacteditor/cdo/ContactDataObject.cpp
+++ b/source/contacteditor/cdo/ContactDataObject.cpp
@@ -2399,6 +2399,7 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListPID = &GeneralGeographyListPID;
 			GeopositionListTokens = &GeneralGeographyListTokens;
 			GeopositionListMediatype = &GeneralGeographyListMediatype;
+			GeopositionListDataType = &GeneralGeographyListDataType;
 			GeopositionListPref = &GeneralGeographyListPref;	
 			break;
 		case PROPERTY_HOME:
@@ -2408,6 +2409,7 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListPID = &HomeGeographyListPID;
 			GeopositionListTokens = &HomeGeographyListTokens;
 			GeopositionListMediatype = &HomeGeographyListMediatype;
+			GeopositionListDataType = &HomeGeographyListDataType;
 			GeopositionListPref = &HomeGeographyListPref;	
 			break;
 		case PROPERTY_WORK:
@@ -2416,7 +2418,8 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListAltID = &BusinessGeographyListAltID;
 			GeopositionListPID = &BusinessGeographyListPID;
 			GeopositionListTokens = &BusinessGeographyListTokens;
-			GeopositionListMediatype = &BusinessGeographyListMediatype;	
+			GeopositionListMediatype = &BusinessGeographyListMediatype;
+			GeopositionListDataType = &BusinessGeographyListDataType;
 			GeopositionListPref = &BusinessGeographyListPref;
 			break;
 	}
diff --git a/source/contacteditor/cdo/ContactDataObject.h b/source/contacteditor/cdo/ContactDataObject.h
index c481f8d..ebca7b6 100644
--- a/source/contacteditor/cdo/ContactDataObject.h
+++ b/source/contacteditor/cdo/ContactDataObject.h
@@ -218,6 +218,7 @@ class ContactDataObject{
 	std::map<int, wxString> GeneralGeographyListType;
 	std::map<int, wxString> GeneralGeographyListTokens;
 	std::map<int, wxString> GeneralGeographyListMediatype;
+	std::map<int, wxString> GeneralGeographyListDataType;
 	std::map<int, int> GeneralGeographyListPref;
 
 	std::map<int, wxString> GeneralRelatedList;
@@ -342,6 +343,7 @@ class ContactDataObject{
 	std::map<int, wxString> HomeGeographyListType;
 	std::map<int, wxString> HomeGeographyListTokens;
 	std::map<int, wxString> HomeGeographyListMediatype;
+	std::map<int, wxString> HomeGeographyListDataType;
 	std::map<int, int> HomeGeographyListPref;
 	
 	std::map<int, wxString> HomeWebsiteList;
@@ -457,6 +459,7 @@ class ContactDataObject{
 	std::map<int, wxString> BusinessGeographyListType;
 	std::map<int, wxString> BusinessGeographyListTokens;
 	std::map<int, wxString> BusinessGeographyListMediatype;
+	std::map<int, wxString> BusinessGeographyListDataType;
 	std::map<int, int> BusinessGeographyListPref;			
 	
 	std::map<int, wxString> BusinessWebsiteList;
-- 
2.39.5