3 files changed, 36 insertions, 4 deletions
diff --git a/Swift/Controllers/UIEvents/JoinMUCUIEvent.h b/Swift/Controllers/UIEvents/JoinMUCUIEvent.h
index c7f8be6..dea3ead 100644
--- a/Swift/Controllers/UIEvents/JoinMUCUIEvent.h
+++ b/Swift/Controllers/UIEvents/JoinMUCUIEvent.h
@@ -10,17 +10,21 @@
 #include <boost/shared_ptr.hpp>
 #include <string>
 
+#include <Swiften/JID/JID.h>
+
 #include "Swift/Controllers/UIEvents/UIEvent.h"
 
 namespace Swift {
 	class JoinMUCUIEvent : public UIEvent {
 		public:
 			typedef boost::shared_ptr<JoinMUCUIEvent> ref;
-			JoinMUCUIEvent(const JID& jid, const boost::optional<std::string>& nick = boost::optional<std::string>()) : jid_(jid), nick_(nick) {};
+			JoinMUCUIEvent(const JID& jid, const boost::optional<std::string>& nick = boost::optional<std::string>(), bool joinAutomaticallyInFuture = false) : jid_(jid), nick_(nick), joinAutomatically_(joinAutomaticallyInFuture){};
 			boost::optional<std::string> getNick() {return nick_;};
 			JID getJID() {return jid_;};
+			bool getShouldJoinAutomatically() {return joinAutomatically_;}
 		private:
 			JID jid_;
 			boost::optional<std::string> nick_;
+			bool joinAutomatically_;
 	};
 }
diff --git a/Swift/Controllers/UIEvents/RequestAdHocUIEvent.h b/Swift/Controllers/UIEvents/RequestAdHocUIEvent.h
new file mode 100644
index 0000000..c3b4b49
--- /dev/null
+++ b/Swift/Controllers/UIEvents/RequestAdHocUIEvent.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2010 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swift/Controllers/UIInterfaces/MainWindow.h>
+
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+
+namespace Swift {
+	class RequestAdHocUIEvent : public UIEvent {
+		public:
+			RequestAdHocUIEvent(const DiscoItems::Item& command) : command_(command) {};
+			const DiscoItems::Item& getCommand() const {return command_;}
+		private:
+			DiscoItems::Item command_;
+	};
+}
diff --git a/Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h b/Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h
index dd2ff6c..2c7b105 100644
--- a/Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h
@@ -6,18 +6,25 @@
 
 #pragma once
 
-#include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-
 #include <string>
+
 #include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <Swiften/JID/JID.h>
 
 namespace Swift {
 	class RequestJoinMUCUIEvent : public UIEvent {
 		public:
 			typedef boost::shared_ptr<RequestJoinMUCUIEvent> ref;
 
-			RequestJoinMUCUIEvent() {
+			RequestJoinMUCUIEvent(const JID& room = JID()) : room(room) {
 			}
+
+			const JID& getRoom() const {
+				return room;
+			}
+
+		private:
+			JID room;
 	};
 }