X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Load.cpp;h=aa5b0e9d845df99ea4c13a6cf4896ef566726efb;hb=01a3141be71e31f6eabd97d65cb630ddeaa1a5c9;hp=56e4b9ff3c4349cfcf3095070398dc681851dfa4;hpb=97ebb2bdd18e21f4ed3e7a99e91b411cf5827324;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 56e4b9f..aa5b0e9 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -166,7 +166,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		
 	LoadMember(&ContactEditorData.GroupsList);
 
-	// Process the address (ADR) (frmContactEditor-LoadAddress.cpp)
+	// Process the addresses (ADR) (frmContactEditor-LoadAddress.cpp)
 	
 	LoadAddress(&ContactEditorData.GeneralAddressList,
 		&ContactEditorData.GeneralAddressListTown,
@@ -185,6 +185,26 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		&ContactEditorData.BusinessAddressListPref,
 		&ADRCount);
 
+	// Process the timezones (TZ) (frmContactEditor-LoadTimeZone.cpp)
+	
+	LoadTimeZone(&ContactEditorData.GeneralTZList,
+		&ContactEditorData.GeneralTZListPref,
+		&ContactEditorData.HomeTZList,
+		&ContactEditorData.HomeTZListPref,
+		&ContactEditorData.BusinessTZList,
+		&ContactEditorData.BusinessTZListPref,
+		&TZCount);
+		
+	// Process the emails (frmContactEditor-LoadEmail.cpp)
+	
+	LoadEmail(&ContactEditorData.GeneralEmailList,
+		&ContactEditorData.GeneralEmailListPref,
+		&ContactEditorData.HomeEmailList,
+		&ContactEditorData.HomeEmailListPref,
+		&ContactEditorData.BusinessEmailList,
+		&ContactEditorData.BusinessEmailListPref,
+		&EmailCount);	
+
 	for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
 	 iter != ContactFileLines.end(); ++iter){
 	
@@ -334,25 +354,25 @@ bool frmContactEditor::LoadContact(wxString Filename){
 			
 			LoadAnniversary(wxSPropertySeg1, wxSPropertySeg2, &AnniversaryProcessed);
 		
-		}*/ else if (wxSProperty == wxT("TZ")){
+		} else if (wxSProperty == wxT("TZ")){
 		
 			// See frmContactEditor-LoadTimeZone.cpp
 		
 			LoadTimeZone(wxSPropertySeg1, wxSPropertySeg2, &TZCount);	
 		
-		}/* else if (wxSProperty == wxT("ADR")){
+		}  else if (wxSProperty == wxT("ADR")){
 			
 			// See frmContactEditor-LoadAddress.cpp
 		
 			LoadADR(wxSPropertySeg1, wxSPropertySeg2, &ADRCount);
 		
-		}*/ else if (wxSProperty == wxT("EMAIL")){
+		} else if (wxSProperty == wxT("EMAIL")){
 		
 			// See frmContactEditor-LoadEmail.cpp
 			
 			LoadEmail(wxSPropertySeg1, wxSPropertySeg2, &EmailCount);	
 		
-		} else if (wxSProperty == wxT("IMPP")){
+		}*/ else if (wxSProperty == wxT("IMPP")){
 		
 			// See frmContactEditor-LoadIM.cpp