Implemented loading for EMAIL using ContactDataObject.

[xestiaab/.git] / source / contacteditor / frmContactEditor-Load.cpp

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index c8e1362..aa5b0e9 100644 (file)
--- 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,7 +185,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                &ContactEditorData.BusinessAddressListPref,
                &ADRCount);
 
-       // Process the timezone (TZ) (frmContactEditor-LoadTimeZone.cpp)
+       // Process the timezones (TZ) (frmContactEditor-LoadTimeZone.cpp)
        
        LoadTimeZone(&ContactEditorData.GeneralTZList,
                &ContactEditorData.GeneralTZListPref,
@@ -194,6 +194,16 @@ bool frmContactEditor::LoadContact(wxString Filename){
                &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){
@@ -356,13 +366,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
                
                        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