8 files changed, 117 insertions, 33 deletions
diff --git a/Swift/Controllers/AdHocController.cpp b/Swift/Controllers/AdHocController.cpp
new file mode 100644
index 0000000..c017120
--- /dev/null
+++ b/Swift/Controllers/AdHocController.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010-2014 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <boost/bind.hpp>
+#include <Swift/Controllers/AdHocController.h>
+#include <Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h>
+
+namespace Swift {
+
+AdHocController::AdHocController(AdHocCommandWindowFactory* factory, boost::shared_ptr<OutgoingAdHocCommandSession> command) {
+	window_ = factory->createAdHocCommandWindow(command);
+	window_->onClosing.connect(boost::bind(&AdHocController::handleWindowClosed, this));
+}
+
+AdHocController::~AdHocController() {
+	window_->onClosing.disconnect(boost::bind(&AdHocController::handleWindowClosed, this));
+	delete window_;
+}
+
+void AdHocController::setOnline(bool online) {
+	window_->setOnline(online);
+}
+
+void AdHocController::handleWindowClosed() {
+	onDeleting();
+}
+
+}
diff --git a/Swift/Controllers/AdHocController.h b/Swift/Controllers/AdHocController.h
new file mode 100644
index 0000000..910756f
--- /dev/null
+++ b/Swift/Controllers/AdHocController.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010-2014 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+#include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
+
+namespace Swift {
+
+class AdHocCommandWindowFactory;
+class AdHocCommandWindow;
+
+class AdHocController {
+public:
+	AdHocController(AdHocCommandWindowFactory* factory, boost::shared_ptr<OutgoingAdHocCommandSession> command);
+	~AdHocController();
+	boost::signal<void ()> onDeleting;
+	void setOnline(bool online);
+private:
+	void handleWindowClosed();
+	AdHocCommandWindow* window_;
+};
+
+}
diff --git a/Swift/Controllers/AdHocManager.cpp b/Swift/Controllers/AdHocManager.cpp
index e926138..59e139b 100644
--- a/Swift/Controllers/AdHocManager.cpp
+++ b/Swift/Controllers/AdHocManager.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swift/Controllers/AdHocManager.h>
 
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
@@ -25,46 +25,62 @@ AdHocManager::AdHocManager(const JID& jid, AdHocCommandWindowFactory* factory, I
 	uiEventStream_ = uiEventStream;
 	mainWindow_ = mainWindow;
 	factory_ = factory;
 
 	uiEventStream_->onUIEvent.connect(boost::bind(&AdHocManager::handleUIEvent, this, _1));
 }
 
 AdHocManager::~AdHocManager() {
 	uiEventStream_->onUIEvent.disconnect(boost::bind(&AdHocManager::handleUIEvent, this, _1));
+	for (size_t i = 0; i < controllers_.size(); ++i) {
+		controllers_[i]->onDeleting.disconnect(boost::bind(&AdHocManager::removeController, this, controllers_[i]));
+	}
+}
+
+void AdHocManager::removeController(boost::shared_ptr<AdHocController> controller) {
+	controller->onDeleting.disconnect(boost::bind(&AdHocManager::removeController, this, controller));
+	controllers_.erase(std::find(controllers_.begin(), controllers_.end(), controller));
 }
 
 void AdHocManager::setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info) {
 	if (iqRouter_->isAvailable() && info->hasFeature(DiscoInfo::CommandsFeature)) {
 		if (discoItemsRequest_) {
 			discoItemsRequest_->onResponse.disconnect(boost::bind(&AdHocManager::handleServerDiscoItemsResponse, this, _1, _2));
 			discoItemsRequest_.reset();
 		}
 		discoItemsRequest_ = GetDiscoItemsRequest::create(JID(jid_.getDomain()), DiscoInfo::CommandsFeature, iqRouter_);
 		discoItemsRequest_->onResponse.connect(boost::bind(&AdHocManager::handleServerDiscoItemsResponse, this, _1, _2));
 		discoItemsRequest_->send();
 	} else {
 		mainWindow_->setAvailableAdHocCommands(std::vector<DiscoItems::Item>());
 	}
+}
 
+void AdHocManager::setOnline(bool online) {
+	foreach (boost::shared_ptr<AdHocController> controller, controllers_) {
+		controller->setOnline(online);
+	}
 }
 
 void AdHocManager::handleServerDiscoItemsResponse(boost::shared_ptr<DiscoItems> items, ErrorPayload::ref error) {
 	std::vector<DiscoItems::Item> commands;
 	if (!error) {
 		foreach (DiscoItems::Item item, items->getItems()) {
 			if (item.getNode() != "http://isode.com/xmpp/commands#test") {
 				commands.push_back(item);
 			}
 		}
 	}
 	mainWindow_->setAvailableAdHocCommands(commands);
 }
 
 void AdHocManager::handleUIEvent(boost::shared_ptr<UIEvent> event) {
 	boost::shared_ptr<RequestAdHocUIEvent> adHocEvent = boost::dynamic_pointer_cast<RequestAdHocUIEvent>(event);
 	if (adHocEvent) {
-		factory_->createAdHocCommandWindow(boost::make_shared<OutgoingAdHocCommandSession>(adHocEvent->getCommand().getJID(), adHocEvent->getCommand().getNode(), iqRouter_));
+		boost::shared_ptr<OutgoingAdHocCommandSession> command = boost::make_shared<OutgoingAdHocCommandSession>(adHocEvent->getCommand().getJID(), adHocEvent->getCommand().getNode(), iqRouter_);
+		boost::shared_ptr<AdHocController> controller = boost::make_shared<AdHocController>(factory_, command);
+		controller->onDeleting.connect(boost::bind(&AdHocManager::removeController, this, controller));
+		controllers_.push_back(controller);
 	}
 }
 
 }
diff --git a/Swift/Controllers/AdHocManager.h b/Swift/Controllers/AdHocManager.h
index 47b03cd..b2c34c5 100644
--- a/Swift/Controllers/AdHocManager.h
+++ b/Swift/Controllers/AdHocManager.h
@@ -1,40 +1,44 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#pragma once
-
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/DiscoItems.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Disco/GetDiscoItemsRequest.h>
+#include <Swiften/Client/Client.h>
 #include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <Swift/Controllers/AdHocController.h>
 
 namespace Swift {
-	class IQRouter;
-	class MainWindow;
-	class UIEventStream;
-	class AdHocCommandWindowFactory;
-	class AdHocManager {
-		public:
-			AdHocManager(const JID& jid, AdHocCommandWindowFactory* factory, IQRouter* iqRouter, UIEventStream* uiEventStream, MainWindow* mainWindow);
-			~AdHocManager();
-			void setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info);
-		private:
-			void handleUIEvent(boost::shared_ptr<UIEvent> event);
-			void handleServerDiscoItemsResponse(boost::shared_ptr<DiscoItems>, ErrorPayload::ref error);
-			JID jid_;
-			IQRouter* iqRouter_;
-			UIEventStream* uiEventStream_;
-			MainWindow* mainWindow_;
-			AdHocCommandWindowFactory* factory_;
-			GetDiscoItemsRequest::ref discoItemsRequest_;
-	};
+class IQRouter;
+class MainWindow;
+class UIEventStream;
+class AdHocCommandWindowFactory;
+class AdHocManager {
+public:
+	AdHocManager(const JID& jid, AdHocCommandWindowFactory* factory, IQRouter* iqRouter, UIEventStream* uiEventStream, MainWindow* mainWindow);
+	~AdHocManager();
+	void removeController(boost::shared_ptr<AdHocController> contoller);
+	void setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info);
+	void setOnline(bool online);
+private:
+	void handleServerDiscoItemsResponse(boost::shared_ptr<DiscoItems>, ErrorPayload::ref error);
+	void handleUIEvent(boost::shared_ptr<UIEvent> event);
+	boost::signal<void (const AdHocController&)> onControllerComplete;
+	JID jid_;
+	IQRouter* iqRouter_;
+	UIEventStream* uiEventStream_;
+	MainWindow* mainWindow_;
+	AdHocCommandWindowFactory* factory_;
+	GetDiscoItemsRequest::ref discoItemsRequest_;
+	std::vector<boost::shared_ptr<AdHocController> > controllers_;
+};
+
 }
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index f16f8ad..79b7502 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -416,19 +416,19 @@ void MainController::handleConnected() {
 	rosterController_->getWindow()->setStreamEncryptionStatus(client_->isStreamEncrypted());
 	profileController_->setAvailable(true);
 	contactEditController_->setAvailable(true);
 	/* Send presence later to catch all the incoming presences. */
 	sendPresence(statusTracker_->getNextPresence());
 
 	/* Enable chats last of all, so rejoining MUCs has the right sent presence */
 	assert(chatsManager_);
 	chatsManager_->setOnline(true);
-
+	adHocManager_->setOnline(true);
 }
 
 void MainController::handleEventQueueLengthChange(int count) {
 	dock_->setNumberOfPendingMessages(count);
 }
 
 void MainController::reconnectAfterError() {
 	if (reconnectTimer_) {
 		reconnectTimer_->stop();
@@ -596,18 +596,21 @@ void MainController::performLoginFromCachedCredentials() {
 	clientOptions.forgetPassword = eagle;
 	clientOptions.useTLS = eagle ? ClientOptions::RequireTLS : clientOptions_.useTLS;
 	client_->connect(clientOptions);
 }
 
 void MainController::handleDisconnected(const boost::optional<ClientError>& error) {
 	if (rosterController_) {
 		rosterController_->getWindow()->setStreamEncryptionStatus(false);
 	}
+	if (adHocManager_) {
+		adHocManager_->setOnline(false);
+	}
 	if (settings_->getSetting(SettingConstants::FORGET_PASSWORDS)) {
 		purgeCachedCredentials();
 	}
 	if (quitRequested_) {
 		resetClient();
 		loginWindow_->quit();
 	}
 	else if (error) {
 		std::string message;
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index e911a3a..4c71268 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -51,18 +51,19 @@ if env["SCONS_STAGE"] == "build" :
 			"XMLConsoleController.cpp",
 			"HistoryViewController.cpp",
 			"HistoryController.cpp",
 			"FileTransferListController.cpp",
 			"BlockListController.cpp",
 			"StatusTracker.cpp",
 			"PresenceNotifier.cpp",
 			"EventNotifier.cpp",
 			"AdHocManager.cpp",
+			"AdHocController.cpp",
 			"XMPPEvents/EventController.cpp",
 			"UIEvents/UIEvent.cpp",
 			"UIInterfaces/XMLConsoleWidget.cpp",
 			"UIInterfaces/ChatListWindow.cpp",
 			"PreviousStatusStore.cpp",
 			"ProfileSettingsProvider.cpp",
 			"Settings/SettingsProviderHierachy.cpp",
 			"Settings/XMLSettingsProvider.cpp",
 			"Storages/CertificateStorageFactory.cpp",
diff --git a/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h b/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h
index 835defe..07319c2 100644
--- a/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h
+++ b/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h
@@ -1,14 +1,18 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/boost_bsignals.h>
+
 namespace Swift {
 	class AdHocCommandWindow {
 		public:
 			virtual ~AdHocCommandWindow() {}
+			virtual void setOnline(bool /*online*/) {}
+			boost::signal<void ()> onClosing;
 	};
 }
diff --git a/Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h b/Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h
index ae77180..eeefa2d 100644
--- a/Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h
+++ b/Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h
@@ -1,22 +1,19 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <Swift/Controllers/UIInterfaces/AdHocCommandWindow.h>
 #include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
 
 namespace Swift {
+class AdHocCommandWindow;
 	class AdHocCommandWindowFactory {
 		public:
 			virtual ~AdHocCommandWindowFactory() {}
-			/**
-			 * The UI should deal with the lifetime of this window (i.e. DeleteOnClose),
-			 * so the result isn't returned.
-			 */
-			virtual void createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) = 0;
+			virtual AdHocCommandWindow* createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) = 0;
 	};
 }