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

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 1ef92c4..77514d9 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -1,3 +1,21 @@
+// frmContactEditor-Load.cpp - frmContactEditor load contact subroutines.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include <map>
 
 #include <wx/ffile.h>
@@ -21,7 +39,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 +96,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 +220,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