X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.cpp;h=0314c8f5cf5d2b1ee1c8d48fc7188c85f82bca0f;hb=309db7c19b8b0f5a89d39ec03152d4d761224c76;hp=6cf9ad7cb296143449a2a6aa4e54eda3d1a6b166;hpb=f125e74b6db8cc35afe15168f9f06256f6b35d35;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index 6cf9ad7..0314c8f 100644
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -38,9 +38,6 @@
 #include "../vcard/vcard34conv.h"
 #include "../vcard/vcard.h"
 
-#ifndef FRMACTIVITYMGR_H
-#define FRMACTIVITYMGR_H
-
 DEFINE_EVENT_TYPE(ACTMGR_RESUMEPROC);
 DEFINE_EVENT_TYPE(ACTMGR_TOGGLECONN);
 DEFINE_EVENT_TYPE(ACTMGR_STARTTIMER);
@@ -1026,11 +1023,13 @@ void frmActivityMgr::ProcessTasksThread()
 				
 						// Check if any errors have occured whilst getting the data.
 				
-						int ErrorCode = ConnHandle.GetResultCode();
+						int ErrorCode = ConnHandle.SSLVerifyTest();
 				
-						if (ErrorCode != 0){
+						if (ErrorCode != CURLE_OK){
 					
-							if (ErrorCode == 60 || ErrorCode == 51){
+							if (ErrorCode == CURLE_SSL_CACERT ||
+								ErrorCode == CURLE_PEER_FAILED_VERIFICATION ||
+								ErrorCode == CURLE_SSL_CONNECT_ERROR){
 						
 								// Invalid SSL certificate so bring up a dialog to the user
 								// explaining what has happened and the options available.
@@ -2080,6 +2079,4 @@ void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){
 	
 	}
 
-}
-
-#endif
\ No newline at end of file
+}
\ No newline at end of file