1 files changed, 3 insertions, 31 deletions
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index 3176a51..780201d 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -32,7 +32,7 @@ namespace Swift {
 	class ClientSession;
 	class BasicSessionStream;
 	class EventLoop;
-	class SecurityError;
+	class CertificateTrustChecker;
 
 	/** 
 	 * The central class for communicating with an XMPP server.
@@ -72,14 +72,6 @@ namespace Swift {
 			void connect(const String& host);
 			
 			/**
-			 * Instructs the client to continue initializing the session
-			 * after a security error has occurred (and as such ignoring the error)
-			 *
-			 * \see onSecurityError
-			 */
-			void continueAfterSecurityError();
-
-			/**
 			 * Sends a message.
 			 */
 			void sendMessage(Message::ref);
@@ -140,29 +132,10 @@ namespace Swift {
 				return stanzaChannel_;
 			}
 
-			/**
-			 * Sets whether security errors should be ignored or not.
-			 *
-			 * If this is set to 'true', onSecurityError will not be called when a security
-			 * error occurs, and connecting will continue.
-			 *
-			 * Defaults to true.
-			 */
-			void setIgnoreSecurityErrors(bool b) {
-				ignoreSecurityErrors = b;
-			}
+			void setCertificateTrustChecker(CertificateTrustChecker*);
 
 		public:
 			/**
-			 * Emitted when an error occurred while establishing a secure connection.
-			 *
-			 * If the error is to be ignored, call continueAfterSecurityError(), otherwise call
-			 * finish().
-			 * This signal is not emitted when setIgnoreSecurityErrors() is set to true.
-			 */
-			boost::signal<void (const SecurityError&)> onSecurityError;
-
-			/**
 			 * Emitted when the client was disconnected from the network.
 			 *
 			 * If the connection was due to a non-recoverable error, the type
@@ -217,7 +190,6 @@ namespace Swift {
 			void handleNeedCredentials();
 			void handleDataRead(const String&);
 			void handleDataWritten(const String&);
-			void handleSecurityError(const SecurityError& securityError);
 
 		private:
 			PlatformDomainNameResolver resolver_;
@@ -237,6 +209,6 @@ namespace Swift {
 			boost::shared_ptr<ClientSession> session_;
 			String certificate_;
 			bool disconnectRequested_;
-			bool ignoreSecurityErrors;
+			CertificateTrustChecker* certificateTrustChecker;
 	};
 }