Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Moved common/win32ssl.h include into the __WIN32__ if section in frmNewAccount.cpp
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Tue, 24 May 2016 20:27:45 +0000 (21:27 +0100)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Tue, 24 May 2016 20:27:45 +0000 (21:27 +0100)
source/frmNewAccount.cpp

index 8768196..36a1f71 100644 (file)
 
 #if defined(__WIN32__)
 #include <cryptuiapi.h>
+#include "common/win32ssl.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 )
@@ -321,8 +321,12 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
                std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);
         
                ConnTest.join();
-        
+
+#if defined(__WIN32__)
                if (ServerResult == FALSE && ModifiedCertificateData == FALSE){
+#else
+               if (ServerResult == FALSE){
+#endif
             
                        lblServerConnResult->SetLabel(_("Failed"));
                        lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage());
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy