1 files changed, 10 insertions, 4 deletions
diff --git a/Swift/Controllers/Chat/MUCSearchController.h b/Swift/Controllers/Chat/MUCSearchController.h
index f09a801..6caee54 100644
--- a/Swift/Controllers/Chat/MUCSearchController.h
+++ b/Swift/Controllers/Chat/MUCSearchController.h
@@ -27,6 +27,8 @@ namespace Swift {
 	class MUCSearchWindow;
 	class MUCSearchWindowFactory;
 	class IQRouter;
+	class DiscoServiceWalker;
+	class NickResolver;
 
 	class MUCService {
 		public:
@@ -86,28 +88,32 @@ namespace Swift {
 
 	class MUCSearchController {
 		public:
-			MUCSearchController(const JID& jid, UIEventStream* uiEventStream, MUCSearchWindowFactory* mucSearchWindowFactory, IQRouter* iqRouter, SettingsProvider* settings);
+			MUCSearchController(const JID& jid, UIEventStream* uiEventStream, MUCSearchWindowFactory* mucSearchWindowFactory, IQRouter* iqRouter, SettingsProvider* settings, NickResolver* nickResolver);
 			~MUCSearchController();
 		private:
 			void handleUIEvent(boost::shared_ptr<UIEvent> event);
-			void handleAddService(const JID& jid, bool userTriggered=false);
-			void handleDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, ErrorPayload::ref error, const JID& jid);
+			void handleAddService(const JID& jid);
 			void handleRoomsItemsResponse(boost::shared_ptr<DiscoItems> items, ErrorPayload::ref error, const JID& jid);
-			void handleServerItemsResponse(boost::shared_ptr<DiscoItems> items, ErrorPayload::ref error, const JID& jid);
 			void handleDiscoError(const JID& jid, ErrorPayload::ref error);
+			void handleDiscoServiceFound(const JID&, boost::shared_ptr<DiscoInfo>);
+			void handleDiscoWalkFinished(DiscoServiceWalker* walker);
 			void removeService(const JID& jid);
 			void refreshView();
 			void loadServices();
 			void addAndSaveServices(const JID& jid);
+			void updateInProgressness();
 			UIEventStream* uiEventStream_;
 			MUCSearchWindow* window_;
 			MUCSearchWindowFactory* factory_;
 			SettingsProvider* settings_;
+			NickResolver* nickResolver_;
 			boost::bsignals::scoped_connection uiEventConnection_;
 			std::vector<JID> services_;
 			std::vector<JID> savedServices_;
 			std::map<JID, MUCService> serviceDetails_;
+			std::vector<DiscoServiceWalker*> walksInProgress_;
 			IQRouter* iqRouter_;
 			JID jid_;
+			int itemsInProgress_;
 	};
 }