X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=4c0e354aa2b903b32edab744fd0df4c54deab4be;hb=c58983d98dc0bcaceef7bfd3421a7710f3bd8fc0;hp=b8a80cf47170b37ffa08cb1f8271e98f376d6af6;hpb=2b8ca7c8528a738a40d099e2cce5b974bc741699;p=xestiaab%2F.git

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index b8a80cf..4c0e354 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -85,6 +85,7 @@ DEFINE_EVENT_TYPE(WINDOW_EDIT);
 DEFINE_EVENT_TYPE(WINDOW_CLOSE);
 DEFINE_EVENT_TYPE(CONNSTAT_UPDATE);
 DEFINE_EVENT_TYPE(INVALIDSSLCERT);
+DEFINE_EVENT_TYPE(INVALIDSSLCERTSTRING);
 DEFINE_EVENT_TYPE(GETSELECTEDLIST);
 DEFINE_EVENT_TYPE(SYNCACCOUNT);
 DEFINE_EVENT_TYPE(IMPORT_RESULTSSHOW);
@@ -117,6 +118,7 @@ EVT_COMMAND(wxID_ANY, WINDOW_EDIT, frmMain::WindowEdit)
 EVT_COMMAND(wxID_ANY, WINDOW_CLOSE, frmMain::WindowDelete)
 EVT_COMMAND(wxID_ANY, CONNSTAT_UPDATE, frmMain::UpdateConnectionStatus)
 EVT_COMMAND(wxID_ANY, INVALIDSSLCERT, frmMain::InvalidSSLCertificate)
+EVT_COMMAND(wxID_ANY, INVALIDSSLCERTSTRING, frmMain::InvalidSSLCertificateString)
 EVT_COMMAND(wxID_ANY, GETSELECTEDLIST, frmMain::GetSelectedList)
 EVT_COMMAND(wxID_ANY, SYNCACCOUNT, frmMain::SyncAccount)
 EVT_COMMAND(wxID_ANY, IMPORT_RESULTSSHOW, frmMain::ShowImportResults)
@@ -2103,13 +2105,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(""));
         
 	}
@@ -2750,6 +2753,31 @@ void frmMain::InvalidSSLCertificate( wxCommandEvent &event ){
         
 }
 
+void frmMain::InvalidSSLCertificateString( wxCommandEvent &event ){
+    
+	// Display the form for showing an invalid SSL certificate.
+    
+	frmInvalidSSLCertificate *frameISC = new frmInvalidSSLCertificate ( this );
+	SSLInvalidCertNotifObjString *SSLICNObj = (SSLInvalidCertNotifObjString*)event.GetClientData();
+	SSLCertCollectionString SSLCCData = SSLICNObj->CertCollection;
+	wxString AccountName = SSLICNObj->AccountName;
+	frameISC->LoadData(SSLCCData, AccountName);
+	frameISC->ShowModal();
+    
+	int FinalConflictResult = frameISC->GetResult();
+    
+	wxCommandEvent event2(ACTMGR_RESUMEPROC);
+	event2.SetClientData(SSLICNObj->QRNotifData);
+	event2.SetInt(FinalConflictResult);
+    
+	delete frameISC;
+	frameISC = NULL;
+    
+	frmActivityMgr *frameActMgr = static_cast<frmActivityMgr*>(ActMgrPtr);	
+	wxPostEvent(frameActMgr, event2);
+        
+}
+
 void frmMain::PauseAllTimers(){
     
 	// Pause all the account timers.