1 files changed, 21 insertions, 6 deletions
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index f402f8f..12028d7 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2011 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -11,8 +11,6 @@
 #include <vector>
 
 #include "Swiften/Network/Timer.h"
-#include "SwifTools/Idle/PlatformIdleQuerier.h"
-#include "SwifTools/Idle/ActualIdleDetector.h"
 #include <string>
 #include "Swiften/Client/ClientError.h"
 #include "Swiften/JID/JID.h"
@@ -25,8 +23,10 @@
 #include "Swiften/Elements/CapsInfo.h"
 #include "Swift/Controllers/XMPPEvents/ErrorEvent.h"
 #include "Swift/Controllers/UIEvents/UIEvent.h"
+#include "Swiften/Client/ClientXMLTracer.h"
 
 namespace Swift {
+	class IdleDetector;
 	class UIFactory;
 	class EventLoop;
 	class Client;
@@ -52,6 +52,7 @@ namespace Swift {
 	class SoundEventController;
 	class SoundPlayer;
 	class XMLConsoleController;
+	class FileTransferListController;
 	class UIEventStream;
 	class EventWindowFactory;
 	class EventWindowController;
@@ -62,6 +63,11 @@ namespace Swift {
 	class Storages;
 	class StoragesFactory;
 	class NetworkFactories;
+	class URIHandler;
+	class XMPPURIController;
+	class AdHocManager;
+	class AdHocCommandWindowFactory;
+	class FileTransferOverview;
 
 	class MainController {
 		public:
@@ -76,7 +82,10 @@ namespace Swift {
 					CertificateStorageFactory* certificateStorageFactory,
 					Dock* dock,
 					Notifier* notifier,
-					bool useDelayForLatency);
+					URIHandler* uriHandler,
+					IdleDetector* idleDetector,
+					bool useDelayForLatency,
+					bool eagleMode);
 			~MainController();
 
 
@@ -106,13 +115,12 @@ namespace Swift {
 			void setManagersOffline();
 			void handleNotificationClicked(const JID& jid);
 			void handleForceQuit();
+			void purgeCachedCredentials();
 
 		private:
 			EventLoop* eventLoop_;
 			NetworkFactories* networkFactories_;
 			UIFactory* uiFactory_;
-			PlatformIdleQuerier idleQuerier_;
-			ActualIdleDetector idleDetector_;
 			StoragesFactory* storagesFactory_;
 			Storages* storages_;
 			CertificateStorageFactory* certificateStorageFactory_;
@@ -123,15 +131,19 @@ namespace Swift {
 			SettingsProvider *settings_;
 			ProfileSettingsProvider* profileSettings_;
 			Dock* dock_;
+			URIHandler* uriHandler_;
+			IdleDetector* idleDetector_;
 			TogglableNotifier* notifier_;
 			PresenceNotifier* presenceNotifier_;
 			EventNotifier* eventNotifier_;
 			RosterController* rosterController_;
 			EventController* eventController_;
 			EventWindowController* eventWindowController_;
+			AdHocManager* adHocManager_;
 			LoginWindow* loginWindow_;
 			UIEventStream* uiEventStream_;
 			XMLConsoleController* xmlConsoleController_;
+			FileTransferListController* fileTransferListController_;
 			ChatsManager* chatsManager_;
 			ProfileController* profileController_;
 			ContactEditController* contactEditController_;
@@ -139,6 +151,7 @@ namespace Swift {
 			JID boundJID_;
 			SystemTrayController* systemTrayController_;
 			SoundEventController* soundEventController_;
+			XMPPURIController* xmppURIController_;
 			std::string vCardPhotoHash_;
 			std::string password_;
 			std::string certificateFile_;
@@ -152,5 +165,7 @@ namespace Swift {
 			bool myStatusLooksOnline_;
 			bool quitRequested_;
 			static const int SecondsToWaitBeforeForceQuitting;
+			bool eagleMode_;
+			FileTransferOverview* ftOverview_;
 	};
 }