Merge branch 'master' of ssh://gelforn.xestia.co.uk/scmrepos/xestiaab

[xestiaab/.git] / source / common / getcontactinfo.cpp
diff --git a/source/common/getcontactinfo.cpp b/source/common/getcontactinfo.cpp

index 29e0506..2941aba 100644 (file)
--- a/source/common/getcontactinfo.cpp
+++ b/source/common/getcontactinfo.cpp
@@ -45,7 +45,6 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
         wxString PageData;
         
         wxFileSystem::AddHandler(new wxMemoryFSHandler);
-       //wxMemoryFSHandler::AddFile();
         
         PageData.append(wxT("<html>"));
         PageData.append(wxT("<head>"));
@@ -96,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<wxString, wxString>::iterator striter = MemoryFSList->begin();
@@ -145,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]);
         }
         
@@ -298,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);
@@ -512,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"));