Get FN by using vCard::GetByPartial instead of vCard::Get.

Affects frmContact::SetupContactData(vCard*) and LoadContactData from
getcontactinfo.cpp

diff --git a/source/common/getcontactinfo.cpp b/source/common/getcontactinfo.cpp
index c9e2256..dfd357f 100644 (file)
--- a/source/common/getcontactinfo.cpp
+++ b/source/common/getcontactinfo.cpp
@@ -133,11 +133,19 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        
        // Name (Display As)
        
+       ArrayvCardOutData FNList;
+       FNList = vCardObj->GetByPartial(wxT("FN"));
+       
        PageData.append(wxT("<table style=\"background: #cccccc; width: 100%\">"));
        PageData.append(wxT("<tr>"));
        PageData.append(wxT("<td style=\"width:100%\">"));
        PageData.append(wxT("<h2>"));
-       PageData.append(vCardObj->Get(wxT("FN")));
+       
+       if (FNList.PropCount > 0){
+               FNList.PropValues[0].Trim();
+               PageData.append(FNList.PropValues[0]);
+       }
+       
        PageData.append(wxT("</h2>"));
        PageData.append(wxT("</td>"));
        PageData.append(wxT("<td style=\"width: 200px;\">"));

diff --git a/source/frmContact.cpp b/source/frmContact.cpp
index 2bd4585..ed8f2fb 100644 (file)
--- a/source/frmContact.cpp
+++ b/source/frmContact.cpp
@@ -114,6 +114,13 @@ bool frmContact::SetupContactData(vCard *vCardObj){
        SessionID = wxString::Format(wxT("%i"), rand() % 32768);
        LoadContactData(vCardObj, htmContactData, SessionID, OldSessionID, MemoryFSListPtr);
        SetTitle(vCardObj->Get(wxT("FN")));
+       ArrayvCardOutData FNList;
+       FNList = vCardObj->GetByPartial(wxT("FN"));
+       
+       if (FNList.PropCount > 0){
+               FNList.PropValues[0].Trim();
+               SetTitle(FNList.PropValues[0]);
+       }
 
        WindowData *WData = new WindowData;