Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b82f9b7
)
Moved common/win32ssl.h include into the __WIN32__ if section in frmNewAccount.cpp
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Tue, 24 May 2016 20:27:45 +0000
(21:27 +0100)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Tue, 24 May 2016 20:27:45 +0000
(21:27 +0100)
source/frmNewAccount.cpp
patch
|
blob
|
history
diff --git
a/source/frmNewAccount.cpp
b/source/frmNewAccount.cpp
index
8768196
..
36a1f71
100644
(file)
--- a/
source/frmNewAccount.cpp
+++ b/
source/frmNewAccount.cpp
@@
-24,12
+24,12
@@
#if defined(__WIN32__)
#include <cryptuiapi.h>
#if defined(__WIN32__)
#include <cryptuiapi.h>
+#include "common/win32ssl.h"
#endif
#include "carddav/carddav.h"
#include "common/dirs.h"
#include "common/svrblist.h"
#endif
#include "carddav/carddav.h"
#include "common/dirs.h"
#include "common/svrblist.h"
-#include "common/win32ssl.h"
#include "frmInvalidSSLCertificate.h"
frmNewAccount::frmNewAccount( wxWindow* parent )
#include "frmInvalidSSLCertificate.h"
frmNewAccount::frmNewAccount( wxWindow* parent )
@@
-321,8
+321,12
@@
void frmNewAccount::ProcessNext( wxCommandEvent& event )
std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);
ConnTest.join();
std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);
ConnTest.join();
-
+
+#if defined(__WIN32__)
if (ServerResult == FALSE && ModifiedCertificateData == FALSE){
if (ServerResult == FALSE && ModifiedCertificateData == FALSE){
+#else
+ if (ServerResult == FALSE){
+#endif
lblServerConnResult->SetLabel(_("Failed"));
lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage());
lblServerConnResult->SetLabel(_("Failed"));
lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage());
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy