X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Load.cpp;h=ef9f4f4992af84719f103b3e38f48435852cfb1e;hb=72333f7096a54d703f6d5e7a2489bf7a3a4126e1;hp=2217c94778000a96ad08316439e08db3bc94d23c;hpb=af69cdb68e28e2edb6b4cc7d991d190b13ce509a;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 2217c94..ef9f4f4 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -155,6 +155,16 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	// Process the Gender (GENDER) (frmContactEditor-LoadGender.cpp)
 	
 	LoadGender(&ContactEditorData.Gender, &ContactEditorData.GenderDetails);
+	
+	// Process the Name (N) (frmContactEditor-LoadName.cpp)
+	
+	LoadName(&ContactEditorData.NameTitle, &ContactEditorData.NameForename,
+		&ContactEditorData.NameSurname, &ContactEditorData.NameOtherNames,
+		&ContactEditorData.NameSuffix);
+		
+	// Process the group members (MEMBER) (frmContactEditor-LoadGroup.cpp)
+		
+	LoadMember(&ContactEditorData.GroupsList);
 
 	for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
 	 iter != ContactFileLines.end(); ++iter){
@@ -263,25 +273,25 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		
 			LoadKind(wxSPropertySeg2);
 		
-		}*/ else if (wxSProperty == wxT("MEMBER")){
+		}/* else if (wxSProperty == wxT("MEMBER")){
 
 			// See frmContactEditor-LoadGroup.cpp
 
 			LoadMember(wxSPropertySeg2, &GroupCount);		
 		
-		} else if (wxSProperty == wxT("FN")){
+		}*/ else if (wxSProperty == wxT("FN")){
 		
 			// See frmContactEditor-LoadName.cpp
 		
 			LoadFN(wxSPropertySeg1, wxSPropertySeg2, &FNCount, &FNProcessed, &ContactData);
 		
-		} else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
+		}/* else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
 		
 			// See frmContactEditor-LoadName.cpp
 		
 			LoadN(wxSPropertySeg1, wxSPropertySeg2, &NameProcessed, &ContactData);
 		
-		} else if (wxSProperty == wxT("NICKNAME")){
+		}*/ else if (wxSProperty == wxT("NICKNAME")){
 			
 			// See frmContactEditor-LoadNickname.cpp