Now getting UIDToken from ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index a0f67ea..79e23ab 100644 (file)
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -90,13 +90,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
        bool HasExtraNicknames = FALSE;
        bool IgnoreGender = FALSE;
        bool ExtraLineSeek = TRUE;
-       bool BirthdayProcessed = FALSE;
-       bool AnniversaryProcessed = FALSE;
+       //bool BirthdayProcessed = FALSE;
+       //bool AnniversaryProcessed = FALSE;
        bool FNProcessed = FALSE;
        bool GenderProcessed = FALSE;
        bool NameProcessed = FALSE;
        bool UIDProcessed = FALSE;
-       bool KindProcessed = FALSE;
+       //bool KindProcessed = FALSE;
        bool ETagFound = FALSE;
        bool ETagOrigFound = FALSE;
        bool VersionProcessed = FALSE;
@@ -136,6 +136,10 @@ bool frmContactEditor::LoadContact(wxString Filename){
        int XTokenCount = 0;
        //int intValueSeek = 1;
 
+       // Process the unique ID (UID)
+       
+       UIDToken = ContactEditorData.UIDToken;
+
        // Process the contact type (KIND) (frmContactEditor-LoadGroup.cpp)
 
        LoadKind(&ContactEditorData.ContactKind);
@@ -427,12 +431,12 @@ bool frmContactEditor::LoadContact(wxString Filename){
                        
                        LoadKey(wxSPropertySeg1, wxSPropertySeg2, &KeyCount);
                
-               } else if (wxSProperty == wxT("UID") && UIDProcessed == FALSE){
+               }/* else if (wxSProperty == wxT("UID") && UIDProcessed == FALSE){
                
                        UIDToken = wxSPropertySeg2;
                        UIDProcessed = TRUE;
                
-               } else if (wxSProperty.Mid(0, 3) == wxT("VND")){
+               }*/ else if (wxSProperty.Mid(0, 3) == wxT("VND")){
                
                        // Split the Vendor three ways.