From 08376a65babc16285608b7f8a84f1202b709d4c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Tue, 24 Apr 2012 22:26:20 +0200
Subject: Fixed compilation problems on windows.


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
 		{
-- 
cgit v0.10.2-6-g49f6