X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmNewAccount.cpp;h=36a1f7165dbdefada6e85700b79e3f2452d24a44;hb=refs%2Ftags%2Frelease-0.13;hp=87681963e58b89ea3b0bc305d68177cd32a5be75;hpb=ee7305a77c32ef3c9a0217b19431efe215795e7d;p=xestiaab%2F.git diff --git a/source/frmNewAccount.cpp b/source/frmNewAccount.cpp index 8768196..36a1f71 100644 --- a/source/frmNewAccount.cpp +++ b/source/frmNewAccount.cpp @@ -24,12 +24,12 @@ #if defined(__WIN32__) #include +#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());