X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Load.cpp;h=3f1d4075a33a39b742412502862d8121aafee1e8;hb=e7eaa503e46395e1126c901b1ff0d25388259ba5;hp=1ef92c485598ea6be4e1978765fb67de7bf4f907;hpb=0f855c5d57f952d2aae11759a60de90146e03c68;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 1ef92c4..3f1d407 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -21,7 +21,10 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	wxString wxSContactString;
 	wxString ContactLine;
 	vCard ContactData;
-	XABViewMode XVMData = MainPtr->GetViewMode();
+	XABViewMode XVMData;
+	if (StartupEditMode == FALSE){
+		XVMData = MainPtr->GetViewMode();
+	}
 	
 	wxSContactFilename = Filename;
 	
@@ -75,6 +78,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	bool KindProcessed = FALSE;
 	bool ETagFound = FALSE;
 	bool ETagOrigFound = FALSE;
+	bool VersionProcessed = FALSE;
 	int intExtraNickname = 0;
 	wxString wxSProperty;
 	wxString wxSPropertySeg1;
@@ -198,7 +202,22 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		
 		// Add the data into the contact editor depending on what it is.				
 		
-		if (wxSProperty == wxT("KIND") && KindProcessed == FALSE){
+		if (wxSProperty == wxT("VERSION") && VersionProcessed == FALSE){
+		
+			// Check if version is 4.0, otherwise don't
+			// load.
+			
+			wxPuts(wxSPropertySeg2);
+			if (wxSPropertySeg2 != wxT("4.0")){
+				wxMessageBox(_("This file is not a vCard 4.0 contact and is not supported under Xestia Address Book."),
+					_("Contact not supported"), wxICON_ERROR);
+				this->Close();
+				return FALSE;
+			}
+			
+			VersionProcessed = TRUE;
+		
+		} if (wxSProperty == wxT("KIND") && KindProcessed == FALSE){
 		
 			// See frmContactEditor-LoadGroup.cpp