4 files changed, 33 insertions, 19 deletions
diff --git a/Swift/Controllers/AdHocManager.cpp b/Swift/Controllers/AdHocManager.cpp
index 368771f..0fa63a1 100644
--- a/Swift/Controllers/AdHocManager.cpp
+++ b/Swift/Controllers/AdHocManager.cpp
@@ -11,7 +11,6 @@
 
 #include <Swiften/Base/foreach.h>
 #include <Swiften/Queries/IQRouter.h>
-#include <Swiften/Disco/GetDiscoItemsRequest.h>
 #include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
 #include <Swift/Controllers/UIInterfaces/MainWindow.h>
 #include <Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h>
@@ -30,14 +29,18 @@ AdHocManager::AdHocManager(const JID& jid, AdHocCommandWindowFactory* factory, I
 }
 
 AdHocManager::~AdHocManager() {
-
+	uiEventStream_->onUIEvent.disconnect(boost::bind(&AdHocManager::handleUIEvent, this, _1));
 }
 
 void AdHocManager::setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info) {
 	if (iqRouter_->isAvailable() && info->hasFeature(DiscoInfo::CommandsFeature)) {
-		GetDiscoItemsRequest::ref discoItemsRequest = GetDiscoItemsRequest::create(JID(jid_.getDomain()), DiscoInfo::CommandsFeature, iqRouter_);
-		discoItemsRequest->onResponse.connect(boost::bind(&AdHocManager::handleServerDiscoItemsResponse, this, _1, _2));
-		discoItemsRequest->send();
+		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>());
 	}
diff --git a/Swift/Controllers/AdHocManager.h b/Swift/Controllers/AdHocManager.h
index 9e21bf7..47b03cd 100644
--- a/Swift/Controllers/AdHocManager.h
+++ b/Swift/Controllers/AdHocManager.h
@@ -7,12 +7,14 @@
 #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 <Swift/Controllers/UIEvents/UIEvent.h>
 
 namespace Swift {
@@ -33,5 +35,6 @@ namespace Swift {
 			UIEventStream* uiEventStream_;
 			MainWindow* mainWindow_;
 			AdHocCommandWindowFactory* factory_;
+			GetDiscoItemsRequest::ref discoItemsRequest_;
 	};
 }
diff --git a/Swift/QtUI/QtAdHocCommandWindow.cpp b/Swift/QtUI/QtAdHocCommandWindow.cpp
index f6b1b5c..a3bb077 100644
--- a/Swift/QtUI/QtAdHocCommandWindow.cpp
+++ b/Swift/QtUI/QtAdHocCommandWindow.cpp
@@ -9,6 +9,7 @@
 #include <boost/bind.hpp>
 #include <QBoxLayout>
 #include <Swift/QtUI/QtFormWidget.h>
+#include <Swiften/Elements/Command.h>
 
 namespace Swift {
 QtAdHocCommandWindow::QtAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) : command_(command) {
@@ -47,6 +48,10 @@ QtAdHocCommandWindow::QtAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocComman
 	nextButton_->setEnabled(false);
 	backButton_->setEnabled(false);
 	completeButton_->setEnabled(false);
+	actions_[Command::Next] = nextButton_;
+	actions_[Command::Prev] = backButton_;
+	actions_[Command::Complete] = completeButton_;
+	actions_[Command::Cancel] = cancelButton_;
 	show();
 }
 
@@ -109,21 +114,23 @@ void QtAdHocCommandWindow::setNoForm() {
 	delete formWidget_;
 }
 
-void QtAdHocCommandWindow::setAvailableActions(Command::ref commandResult) {
-	const std::vector<Command::Action> actions = commandResult->getAvailableActions();
-	nextButton_->setEnabled(std::find(actions.begin(), actions.end(), Command::Next) != actions.end());
-	backButton_->setEnabled(std::find(actions.begin(), actions.end(), Command::Prev) != actions.end());
-	completeButton_->setEnabled(std::find(actions.begin(), actions.end(), Command::Complete) != actions.end());
-
-
-	if (command_->getIsMultiStage()) {
-		backButton_->show();
-		nextButton_->show();
-	}
-	else {
-		backButton_->hide();
-		nextButton_->hide();
+typedef std::pair<Command::Action, QPushButton*> ActionButton;
 
+void QtAdHocCommandWindow::setAvailableActions(Command::ref /*commandResult*/) {
+	foreach (ActionButton pair, actions_) {
+		OutgoingAdHocCommandSession::ActionState state = command_->getActionState(pair.first);
+		if (state & OutgoingAdHocCommandSession::Present) {
+			pair.second->show();
+		}
+		else {
+			pair.second->hide();
+		}
+		if (state & OutgoingAdHocCommandSession::Enabled) {
+			pair.second->setEnabled(true);
+		}
+		else {
+			pair.second->setEnabled(false);
+		}
 	}
 }
 
diff --git a/Swift/QtUI/QtAdHocCommandWindow.h b/Swift/QtUI/QtAdHocCommandWindow.h
index f1073bc..adeb3e6 100644
--- a/Swift/QtUI/QtAdHocCommandWindow.h
+++ b/Swift/QtUI/QtAdHocCommandWindow.h
@@ -43,5 +43,6 @@ namespace Swift {
 			QPushButton* nextButton_;
 			QPushButton* completeButton_;
 			QPushButton* cancelButton_;
+			std::map<Command::Action, QPushButton*> actions_;
 	};
 }