X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=3d4d319fd2dece36ef51a8d02525bf562a253bfc;hp=854cb56c159635d27244f7ef6486b5ed037b92da;hb=cdd1530fcf2b19be9187604deb6aa78fba091366;hpb=cbb594a87fa3bf6d8511d637f8a390f0e9edc9ea diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 854cb56..3d4d319 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -36,7 +36,6 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ // Check that the vCard is a valid vCard 4.0 file. - vCard vCard4FormatCheck; vCard4FormatCheck.LoadFile(Filename); @@ -46,6 +45,16 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ return CONTACTLOAD_FILEINVALIDFORMAT; } + + // Check that the vCard meets the base specification. + + if (!vCard4FormatCheck.MeetBaseSpecification()){ + + return CONTACTLOAD_FILEBASESPECFAIL; + + } + + return CONTACTLOAD_UNITTESTFAIL;