X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Fgetcontactinfo.cpp;h=2941aba67395e8328f52c3d416682708beef0e2a;hb=3ea1eb0f68896a1269eaea72873eaa744503897a;hp=dfd357f667a03fa9c1c019977ab9f06599d47d70;hpb=735fd842be7625b7fc4d65832dff8e33f6fb463b;p=xestiaab%2F.git diff --git a/source/common/getcontactinfo.cpp b/source/common/getcontactinfo.cpp index dfd357f..2941aba 100644 --- a/source/common/getcontactinfo.cpp +++ b/source/common/getcontactinfo.cpp @@ -36,6 +36,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID, wxString OldSID, std::map *MemoryFSList){ + // Load the vCard contact data into the wxHTMLWindow given. + // Show message to user that the contact information is loading. HTMLObj->SetBorders(0); @@ -43,7 +45,6 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID, wxString PageData; wxFileSystem::AddHandler(new wxMemoryFSHandler); - //wxMemoryFSHandler::AddFile(); PageData.append(wxT("")); PageData.append(wxT("")); @@ -94,7 +95,6 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID, // MAke sure new session ID doesn't conflict with existing // data. If there is a match, generate a new one and check again. - bool SIDMatch = FALSE; wxString SIDTemp; for (std::map::iterator striter = MemoryFSList->begin(); @@ -143,6 +143,7 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID, if (FNList.PropCount > 0){ FNList.PropValues[0].Trim(); + CaptureString(&FNList.PropValues[0], false); PageData.append(FNList.PropValues[0]); } @@ -296,23 +297,6 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID, } else { } - - /*int PointX = PointXBase; - int PointY = PointYBase; - int PointW = PointWBase; - int PointH = PointHBase;*/ - - // Bottom Left Method - - /*int PointX = wxAtoi(PhotoRectData.GetNextToken()); - int PointY = photo.GetHeight() - wxAtoi(PhotoRectData.GetNextToken()) - 340; - int PointW = wxAtoi(PhotoRectData.GetNextToken()); - int PointH = wxAtoi(PhotoRectData.GetNextToken());*/ - - // Bottom Right Method - - /*int PointXRemain = photo.GetWidth() - PointX - 140; - int PointYRemain = photo.GetHeight() - PointY - 140;*/ PhotoRectPoints.SetX(PointX); PhotoRectPoints.SetY(PointY); @@ -510,13 +494,6 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID, } - bool MultiLogoIcon = FALSE; - bool MultiPhotoIcon = FALSE; - bool SoundIcon = FALSE; - bool KeyIcon = FALSE; - bool VendorIcon = FALSE; - bool XTokenIcon = FALSE; - // Process Birthday ContactData = vCardObj->GetByPartial(wxT("BDAY")); @@ -1657,6 +1634,8 @@ void SplitPropertyData(wxString *PropertyLine, int intSize, std::map *SplitData){ + // Split the property data into SplitData. + wxString DataStr; wxStringTokenizer PropertyElement; wxString PropertyName;