X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Load.cpp;h=92990a933a5eae79ae1eef37cfcf093193c12301;hb=96a36fb1c4c7e04b5bf17cf07f63f2792d23f067;hp=995bb15e7c459a40113f2b45042948df542474c7;hpb=76d4a9e4241fb4a79b6785e30b5c80b6a2c2d037;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 995bb15..92990a9 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -172,8 +172,8 @@ bool frmContactEditor::LoadContact(wxString Filename){
 
 	// Process the unique ID (UID)
 	
-	UIDToken = ContactEditorData.UIDToken;
-
+	// Do nothing at the moment.
+	
 	// Process the contact type (KIND) (frmContactEditor-LoadGroup.cpp)
 
 	LoadKind(&ContactEditorData.ContactKind);
@@ -374,17 +374,17 @@ bool frmContactEditor::LoadContact(wxString Filename){
 
 	// Process the instant messaging (IMPP).
 	
-	LoadData(&ContactEditorData.GeneralIMList,
+	LoadData(&ContactEditorData.GeneralIMListTypeInfo,
 		&ContactEditorData.GeneralIMListPref,
-		&ContactEditorData.GeneralIMListTypeInfo,
+		&ContactEditorData.GeneralIMList,
 		lboIM,
-		&ContactEditorData.HomeIMList,
-		&ContactEditorData.HomeIMListPref,
 		&ContactEditorData.HomeIMListTypeInfo,
+		&ContactEditorData.HomeIMListPref,
+		&ContactEditorData.HomeIMList,
 		lboHomeIM,
-		&ContactEditorData.BusinessIMList,
-		&ContactEditorData.BusinessIMListPref,
 		&ContactEditorData.BusinessIMListTypeInfo,
+		&ContactEditorData.BusinessIMListPref,
+		&ContactEditorData.BusinessIMList,
 		lboBusinessIM,
 		&IMPPCount);
 
@@ -1541,6 +1541,10 @@ void frmContactEditor::LoadKind(ContactKindType *KindType){
 
 void frmContactEditor::LoadBirthday(wxString *BirthdayData, bool *BirthdayText){
 
+	if (BirthdayData->IsEmpty()){
+	    return;
+	}
+  
 	if (*BirthdayText == FALSE){
 	
 		int DateYear = 0;
@@ -1549,7 +1553,7 @@ void frmContactEditor::LoadBirthday(wxString *BirthdayData, bool *BirthdayText){
 		
 		wxString wxSData;
 		
-		if (Birthday.Mid(0, 2) == wxT("--")){
+		if (BirthdayData->Mid(0, 2) == wxT("--")){
 		
 			// Skip year.
 		
@@ -1576,6 +1580,10 @@ void frmContactEditor::LoadBirthday(wxString *BirthdayData, bool *BirthdayText){
 
 void frmContactEditor::LoadAnniversary(wxString *AnniversaryData, bool *AnniversaryText){
 
+  	if (AnniversaryData->IsEmpty()){
+	    return;
+	}
+  
 	if (*AnniversaryText == FALSE){
 	
 		int DateYear = 0;
@@ -1584,7 +1592,7 @@ void frmContactEditor::LoadAnniversary(wxString *AnniversaryData, bool *Annivers
 		
 		wxString wxSData;
 		
-		if (Anniversary.Mid(0, 2) == wxT("--")){
+		if (AnniversaryData->Mid(0, 2) == wxT("--")){
 		
 			// Skip year.