Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced numbers with actual cURL error codes when running the syncronising data...
[xestiaab/.git]
/
source
/
actmgr
/
frmActivityMgr.cpp
diff --git
a/source/actmgr/frmActivityMgr.cpp
b/source/actmgr/frmActivityMgr.cpp
index
6cf9ad7
..
0314c8f
100644
(file)
--- a/
source/actmgr/frmActivityMgr.cpp
+++ b/
source/actmgr/frmActivityMgr.cpp
@@
-38,9
+38,6
@@
#include "../vcard/vcard34conv.h"
#include "../vcard/vcard.h"
#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);
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.
// 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.
// 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
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy