7 files changed, 31 insertions, 5 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index fb69366..10cf54b 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2013 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
@@ -298,3 +298,3 @@ void ChatController::handleUnblockUserRequest() {
 void ChatController::handleInviteToChat(const std::vector<JID>& droppedJIDs) {
-	boost::shared_ptr<UIEvent> event(new RequestInviteToMUCUIEvent(toJID_.toBare(), droppedJIDs));
+	boost::shared_ptr<UIEvent> event(new RequestInviteToMUCUIEvent(toJID_.toBare(), droppedJIDs, RequestInviteToMUCUIEvent::Impromptu));
 	eventStream_->send(event);
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index f83a772..df99368 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2013 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
@@ -847,3 +847,4 @@ void MUCController::handleDestroyRoomRequest() {
 void MUCController::handleInvitePersonToThisMUCRequest(const std::vector<JID>& jidsToInvite) {
-	boost::shared_ptr<UIEvent> event(new RequestInviteToMUCUIEvent(muc_->getJID(), jidsToInvite));
+	RequestInviteToMUCUIEvent::ImpromptuMode mode = isImpromptu_ ? RequestInviteToMUCUIEvent::Impromptu : RequestInviteToMUCUIEvent::NotImpromptu;
+	boost::shared_ptr<UIEvent> event(new RequestInviteToMUCUIEvent(muc_->getJID(), jidsToInvite, mode));
 	eventStream_->send(event);
diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp
index 12c6777..f259a9a 100644
--- a/Swift/Controllers/Chat/UserSearchController.cpp
+++ b/Swift/Controllers/Chat/UserSearchController.cpp
@@ -100,2 +100,3 @@ void UserSearchController::handleUIEvent(boost::shared_ptr<UIEvent> event) {
 		} else if (inviteToMUCRequest) {
+			window_->setCanSupplyDescription(!inviteToMUCRequest->isImpromptu());
 			window_->setJIDs(inviteToMUCRequest->getInvites());
diff --git a/Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h b/Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h
index 69aa0cd..58f45d1 100644
--- a/Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h
@@ -6,2 +6,8 @@
 
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #pragma once
@@ -19,3 +25,9 @@ namespace Swift {
 
-			RequestInviteToMUCUIEvent(const JID& room, const std::vector<JID>& JIDsToInvite) : room_(room), invite_(JIDsToInvite) {
+			enum ImpromptuMode {
+				Impromptu,
+				NotImpromptu
+			};
+
+			RequestInviteToMUCUIEvent(const JID& room, const std::vector<JID>& JIDsToInvite, ImpromptuMode impromptu) : room_(room), invite_(JIDsToInvite) {
+				isImpromptu_ = impromptu == Impromptu;
 			}
@@ -30,2 +42,6 @@ namespace Swift {
 
+			bool isImpromptu() const {
+				return isImpromptu_;
+			}
+
 		private:
@@ -33,2 +49,3 @@ namespace Swift {
 			std::vector<JID> invite_;
+			bool isImpromptu_;
 	};
diff --git a/Swift/Controllers/UIInterfaces/UserSearchWindow.h b/Swift/Controllers/UIInterfaces/UserSearchWindow.h
index 56992cc..9a095aa 100644
--- a/Swift/Controllers/UIInterfaces/UserSearchWindow.h
+++ b/Swift/Controllers/UIInterfaces/UserSearchWindow.h
@@ -42,2 +42,3 @@ namespace Swift {
 			virtual void addContacts(const std::vector<Contact::ref>& contacts) = 0;
+			virtual void setCanSupplyDescription(bool allowed) = 0;
 
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index c154c8f..40b4e28 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -401,2 +401,7 @@ void QtUserSearchWindow::addContacts(const std::vector<Contact::ref>& contacts)
 
+void QtUserSearchWindow::setCanSupplyDescription(bool allowed) {
+	firstMultiJIDPage_->label->setVisible(allowed);
+	firstMultiJIDPage_->reason_->setVisible(allowed);
+}
+
 void QtUserSearchWindow::handleAddViaSearch() {
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
index bb89e51..0349ba4 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
@@ -53,2 +53,3 @@ namespace Swift {
 			virtual void addContacts(const std::vector<Contact::ref>& contacts);
+			virtual void setCanSupplyDescription(bool allowed);