summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-04-24 20:26:20 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-04-24 20:26:20 (GMT)
commit08376a65babc16285608b7f8a84f1202b709d4c8 (patch)
treeb083caae5838ea6c67e5272412aa5b91cd35524f
parent856f970d14c5c32b80fc5ea359d4e567b51578a0 (diff)
downloadswift-contrib-08376a65babc16285608b7f8a84f1202b709d4c8.zip
swift-contrib-08376a65babc16285608b7f8a84f1202b709d4c8.tar.bz2
Fixed compilation problems on windows.
-rw-r--r--Swift/QtUI/CAPICertificateSelector.cpp10
-rw-r--r--Swiften/Base/Log.h2
-rw-r--r--Swiften/Client/ClientSession.cpp2
-rw-r--r--Swiften/TLS/Schannel/SchannelContext.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/Swift/QtUI/CAPICertificateSelector.cpp b/Swift/QtUI/CAPICertificateSelector.cpp
index cc69956..953051b 100644
--- a/Swift/QtUI/CAPICertificateSelector.cpp
+++ b/Swift/QtUI/CAPICertificateSelector.cpp
@@ -78,11 +78,11 @@ std::string selectCAPICertificate() {
if (titleLength == 0 || promptLength == 0) {
int error = GetLastError();
switch (error) {
- case ERROR_INSUFFICIENT_BUFFER: SWIFT_LOG("error") << "Insufficient buffer for rendering cert dialog" << std::endl;break;
- case ERROR_INVALID_FLAGS: SWIFT_LOG("error") << "Invalid flags for rendering cert dialog" << std::endl;break;
- case ERROR_INVALID_PARAMETER: SWIFT_LOG("error") << "Invalid parameter for rendering cert dialog" << std::endl;break;
- case ERROR_NO_UNICODE_TRANSLATION: SWIFT_LOG("error") << "Invalid unicode for rendering cert dialog" << std::endl;break;
- default: SWIFT_LOG("error") << "Unexpected multibyte conversion errorcode" << std::endl;
+ case ERROR_INSUFFICIENT_BUFFER: SWIFT_LOG(error) << "Insufficient buffer for rendering cert dialog" << std::endl;break;
+ case ERROR_INVALID_FLAGS: SWIFT_LOG(error) << "Invalid flags for rendering cert dialog" << std::endl;break;
+ case ERROR_INVALID_PARAMETER: SWIFT_LOG(error) << "Invalid parameter for rendering cert dialog" << std::endl;break;
+ case ERROR_NO_UNICODE_TRANSLATION: SWIFT_LOG(error) << "Invalid unicode for rendering cert dialog" << std::endl;break;
+ default: SWIFT_LOG(error) << "Unexpected multibyte conversion errorcode" << std::endl;
}
}
diff --git a/Swiften/Base/Log.h b/Swiften/Base/Log.h
index 955227f..06f5b55 100644
--- a/Swiften/Base/Log.h
+++ b/Swiften/Base/Log.h
@@ -14,7 +14,7 @@ namespace Swift {
// Only here to be able to statically check the correctness of the severity levers
namespace Severity {
enum {
- debug, warning, error
+ debug, info, warning, error
};
}
}
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index 81fcf57..70f0398 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -67,7 +67,7 @@ ClientSession::ClientSession(
certificateTrustChecker(NULL) {
#ifdef SWIFTEN_PLATFORM_WIN32
if (WindowsRegistry::isFIPSEnabled()) {
- SWIFT_LOG("info") << "Windows is running in FIPS-140 mode. Some authentication methods will be unavailable." << std::endl;
+ SWIFT_LOG(info) << "Windows is running in FIPS-140 mode. Some authentication methods will be unavailable." << std::endl;
}
#endif
}
diff --git a/Swiften/TLS/Schannel/SchannelContext.h b/Swiften/TLS/Schannel/SchannelContext.h
index 62c0da2..587d0e7 100644
--- a/Swiften/TLS/Schannel/SchannelContext.h
+++ b/Swiften/TLS/Schannel/SchannelContext.h
@@ -55,6 +55,8 @@ namespace Swift
virtual ByteArray getFinishMessage() const;
+ virtual void setCheckCertificateRevocation(bool b);
+
private:
void determineStreamSizes();
void continueHandshake(const SafeByteArray& data);
@@ -74,8 +76,6 @@ namespace Swift
void handleCertificateCardRemoved();
- virtual void setCheckCertificateRevocation(bool b);
-
private:
enum SchannelState
{