1 files changed, 48 insertions, 18 deletions
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 14de4eb..6fbde6d 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010-2012 Kevin Smith
+ * Copyright (c) 2010-2013 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -7,22 +7,26 @@
 #pragma once
 
-#include <Swiften/Base/boost_bsignals.h>
-#include <boost/shared_ptr.hpp>
 #include <vector>
-
-#include "Swiften/Network/Timer.h"
+#include <map>
 #include <string>
-#include "Swiften/Client/ClientError.h"
-#include "Swiften/JID/JID.h"
-#include "Swiften/Elements/DiscoInfo.h"
-#include "Swiften/Elements/VCard.h"
-#include "Swiften/Elements/ErrorPayload.h"
-#include "Swiften/Elements/Presence.h"
-#include "Swift/Controllers/Settings/SettingsProvider.h"
-#include "Swift/Controllers/ProfileSettingsProvider.h"
-#include "Swiften/Elements/CapsInfo.h"
-#include "Swift/Controllers/XMPPEvents/ErrorEvent.h"
-#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swiften/Client/ClientXMLTracer.h"
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Network/Timer.h>
+#include <Swiften/Client/ClientError.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/Elements/DiscoInfo.h>
+#include <Swiften/Elements/VCard.h>
+#include <Swiften/Elements/ErrorPayload.h>
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/Elements/CapsInfo.h>
+#include <Swiften/Client/ClientXMLTracer.h>
+
+#include <Swift/Controllers/Settings/SettingsProvider.h>
+#include <Swift/Controllers/ProfileSettingsProvider.h>
+#include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+
 
 namespace Swift {
@@ -44,4 +48,5 @@ namespace Swift {
 	class Notifier;
 	class ProfileController;
+	class ShowProfileController;
 	class ContactEditController;
 	class TogglableNotifier;
@@ -53,4 +58,6 @@ namespace Swift {
 	class SoundPlayer;
 	class XMLConsoleController;
+	class HistoryViewController;
+	class HistoryController;
 	class FileTransferListController;
 	class UIEventStream;
@@ -69,4 +76,10 @@ namespace Swift {
 	class AdHocCommandWindowFactory;
 	class FileTransferOverview;
+	class WhiteboardManager;
+	class HighlightManager;
+	class HighlightEditorController;
+	class BlockListController;
+	class ContactSuggester;
+	class ContactsFromXMPPRoster;
 
 	class MainController {
@@ -85,4 +98,5 @@ namespace Swift {
 					URIHandler* uriHandler,
 					IdleDetector* idleDetector,
+					const std::map<std::string, std::string>& emoticons,
 					bool useDelayForLatency);
 			~MainController();
@@ -92,5 +106,5 @@ namespace Swift {
 			void resetClient();
 			void handleConnected();
-			void handleLoginRequest(const std::string& username, const std::string& password, const std::string& certificatePath, CertificateWithKey::ref certificate, bool remember, bool loginAutomatically);
+			void handleLoginRequest(const std::string& username, const std::string& password, const std::string& certificatePath, CertificateWithKey::ref certificate, const ClientOptions& options, bool remember, bool loginAutomatically);
 			void handleCancelLoginRequest();
 			void handleQuitRequest();
@@ -104,4 +118,5 @@ namespace Swift {
 			void sendPresence(boost::shared_ptr<Presence> presence);
 			void handleInputIdleChanged(bool);
+			void handleShowCertificateRequest();
 			void logout();
 			void signOut();
@@ -116,4 +131,6 @@ namespace Swift {
 			void handleForceQuit();
 			void purgeCachedCredentials();
+			std::string serializeClientOptions(const ClientOptions& options);
+			ClientOptions parseClientOptions(const std::string& optionString);
 
 		private:
@@ -143,8 +160,15 @@ namespace Swift {
 			UIEventStream* uiEventStream_;
 			XMLConsoleController* xmlConsoleController_;
+			HistoryViewController* historyViewController_;
+			HistoryController* historyController_;
 			FileTransferListController* fileTransferListController_;
+			BlockListController* blockListController_;
 			ChatsManager* chatsManager_;
 			ProfileController* profileController_;
+			ShowProfileController* showProfileController_;
 			ContactEditController* contactEditController_;
+			ContactsFromXMPPRoster* contactsFromRosterProvider_;
+			ContactSuggester* contactSuggesterWithoutRoster_;
+			ContactSuggester* contactSuggesterWithRoster_;
 			JID jid_;
 			JID boundJID_;
@@ -155,8 +179,10 @@ namespace Swift {
 			std::string password_;
 			CertificateWithKey::ref certificate_;
+			ClientOptions clientOptions_;
 			boost::shared_ptr<ErrorEvent> lastDisconnectError_;
 			bool useDelayForLatency_;
 			UserSearchController* userSearchControllerChat_;
 			UserSearchController* userSearchControllerAdd_;
+			UserSearchController* userSearchControllerInvite_;
 			int timeBeforeNextReconnect_;
 			Timer::ref reconnectTimer_;
@@ -167,4 +193,8 @@ namespace Swift {
 			static const int SecondsToWaitBeforeForceQuitting;
 			FileTransferOverview* ftOverview_;
+			WhiteboardManager* whiteboardManager_;
+			HighlightManager* highlightManager_;
+			HighlightEditorController* highlightEditorController_;
+			std::map<std::string, std::string> emoticons_;
 	};
 }