1 files changed, 7 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/MUCController.h b/Swift/Controllers/Chat/MUCController.h
index 8e6e01b..9e79835 100644
--- a/Swift/Controllers/Chat/MUCController.h
+++ b/Swift/Controllers/Chat/MUCController.h
@@ -12,6 +12,7 @@
 #include <boost/signals/connection.hpp>
 
 #include "Swiften/Base/String.h"
+#include "Swiften/Network/Timer.h"
 #include "Swift/Controllers/Chat/ChatControllerBase.h"
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Elements/DiscoInfo.h"
@@ -27,10 +28,11 @@ namespace Swift {
 	class Roster;
 	class AvatarManager;
 	class UIEventStream;
+	class TimerFactory;
 
 	class MUCController : public ChatControllerBase {
 		public:
-			MUCController(const JID& self, const JID &muc, const String &nick, StanzaChannel* stanzaChannel, PresenceSender* presenceSender, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, PresenceOracle* presenceOracle, AvatarManager* avatarManager, UIEventStream* events, bool useDelayForLatency);
+			MUCController(const JID& self, const JID &muc, const String &nick, StanzaChannel* stanzaChannel, PresenceSender* presenceSender, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, PresenceOracle* presenceOracle, AvatarManager* avatarManager, UIEventStream* events, bool useDelayForLatency, TimerFactory* timerFactory);
 			~MUCController();
 			boost::signal<void ()> onUserLeft;
 		
@@ -45,6 +47,8 @@ namespace Swift {
 			void handleOccupantJoined(const MUCOccupant& occupant);
 			void handleOccupantLeft(const MUCOccupant& occupant, MUC::LeavingType type, const String& reason);
 			void handleOccupantPresenceChange(boost::shared_ptr<Presence> presence);
+			void handleJoinComplete(MUC::JoinResult result);
+			void handleJoinTimeoutTick();
 
 		private:
 			MUC* muc_;
@@ -52,7 +56,9 @@ namespace Swift {
 			String nick_;
 			Roster* roster_;
 			bool parting_;
+			bool joined_;
 			boost::bsignals::scoped_connection avatarChangedConnection_;
+			boost::shared_ptr<Timer> loginCheckTimer_;
 	};
 }
 #endif