X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=0986e18d1746417a4fd9ca4b74cf4a466c66305f;hb=2c8998278759b5bf6fc3bcf75afd289c214b6c84;hp=3c785f246a2f7e1d08cfbf02384558c2ca36eeb3;hpb=b1467ce3cde3c61f79030bf4329f7037904043e1;p=xestiaab%2F.git

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index 3c785f2..0986e18 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -54,7 +54,6 @@
 #include "common/events.h"
 #include "common/dirs.h"
 #include "vcard/vcard.h"
-#include "carddav/carddav.h"
 #include "contacteditor/frmContactEditor.h"
 #include "import/import.h"
 #include "export/export.h"
@@ -2105,13 +2104,14 @@ void frmMain::DeleteContact(wxCommandEvent& event){
 			if (nextChild == selectedChild){
 			
 				wxSDataURL = prefaccounts.GetAccountDirPrefix(i) + wxT("/") + wxSplitFilename;
+				break;
 
 			}
             
 		}
         
 		// Add task to the activity monitor to delete the contact.
-        
+		
 		frameActMgr->AddTask(2, wxSContactName, ActiveAccount, wxSDataURL, wxSplitFilename, ContactsFileIndex[intContactSeekNum], wxT(""));
         
 	}
@@ -2652,7 +2652,7 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
 
 #else
     
-	std::map<int, SSLCertCollection>::iterator SSLColIter;
+	std::map<int, SSLCertCollectionString>::iterator SSLColIter;
         
 	for (int i = 0; i < prefaccounts.GetCount(); i++){
         
@@ -2679,11 +2679,11 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
             
 			SSLColIter = AccountSSLData.find(i);
             
-			SSLCertCollection SSLCertInfo = SSLColIter->second;
+			SSLCertCollectionString SSLCertInfo = SSLColIter->second;
             
 			frmSSLCertificate *frameSSLCert = new frmSSLCertificate ( this );
 			frameSSLCert->StartCertFrom(0);
-			frameSSLCert->SetupCerts(SSLCertInfo);
+			frameSSLCert->SetupCertsString(SSLCertInfo);
 			frameSSLCert->ShowModal();
             
 			delete frameSSLCert;
@@ -2829,7 +2829,7 @@ void frmMain::UpdateSSLAccountStatus(int AccountID, int SSLStatus, PCCERT_CONTEX
 
 #else
 
-void frmMain::UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc){
+void frmMain::UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollectionString SSLCertInc){
     
 	// Delete existing data.