1 files changed, 33 insertions, 11 deletions
diff --git a/Swift/Controllers/Roster/RosterController.h b/Swift/Controllers/Roster/RosterController.h
index 5e40124..3338d7f 100644
--- a/Swift/Controllers/Roster/RosterController.h
+++ b/Swift/Controllers/Roster/RosterController.h
@@ -7,18 +7,21 @@
 #pragma once
 
-#include "Swiften/JID/JID.h"
 #include <string>
 #include <set>
-#include "Swiften/Elements/Presence.h"
-#include "Swiften/Elements/ErrorPayload.h"
-#include "Swiften/Elements/RosterPayload.h"
-#include "Swiften/Avatars/AvatarManager.h"
-#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "RosterGroupExpandinessPersister.h"
-#include "Swift/Controllers/FileTransfer/FileTransferOverview.h"
 
-#include "Swiften/Base/boost_bsignals.h"
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/Elements/ErrorPayload.h>
+#include <Swiften/Elements/RosterPayload.h>
+#include <Swiften/Avatars/AvatarManager.h>
+#include <Swiften/VCards/VCardManager.h>
+
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
+#include <Swift/Controllers/Roster/RosterGroupExpandinessPersister.h>
+
 namespace Swift {
 	class IQRouter;
@@ -40,14 +43,19 @@ namespace Swift {
 	class EntityCapsProvider;
 	class FileTransferManager;
+	class ClientBlockListManager;
+	class RosterVCardProvider;
 
 	class RosterController {
 		public:
-			RosterController(const JID& jid, XMPPRoster* xmppRoster, AvatarManager* avatarManager, MainWindowFactory* mainWindowFactory, NickManager* nickManager, NickResolver* nickResolver, PresenceOracle* presenceOracle, SubscriptionManager* subscriptionManager, EventController* eventController, UIEventStream* uiEventStream, IQRouter* iqRouter_, SettingsProvider* settings, EntityCapsProvider* entityCapsProvider, FileTransferOverview* fileTransferOverview);
+			RosterController(const JID& jid, XMPPRoster* xmppRoster, AvatarManager* avatarManager, MainWindowFactory* mainWindowFactory, NickManager* nickManager, NickResolver* nickResolver, PresenceOracle* presenceOracle, SubscriptionManager* subscriptionManager, EventController* eventController, UIEventStream* uiEventStream, IQRouter* iqRouter_, SettingsProvider* settings, EntityCapsProvider* entityCapsProvider, FileTransferOverview* fileTransferOverview, ClientBlockListManager* clientBlockListManager, VCardManager* vcardManager);
 			~RosterController();
 			void showRosterWindow();
-			MainWindow* getWindow() {return mainWindow_;};
+			void setJID(const JID& jid) { myJID_ = jid; }
+			MainWindow* getWindow() {return mainWindow_;}
 			boost::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest;
 			boost::signal<void ()> onSignOutRequest;
+			void handleOwnVCardChanged(VCard::ref vcard);
 			void handleAvatarChanged(const JID& jid);
+			void handlePresenceChanged(Presence::ref presence);
 			void setEnabled(bool enabled);
 
@@ -58,4 +66,6 @@ namespace Swift {
 			void updateItem(const XMPPRosterItem&);
 
+			void initBlockingCommand();
+
 		private:
 			void handleOnJIDAdded(const JID &jid);
@@ -71,4 +81,5 @@ namespace Swift {
 			void handleSubscriptionRequestDeclined(SubscriptionRequestEvent* event);
 			void handleUIEvent(boost::shared_ptr<UIEvent> event);
+			void handleRosterItemUpdated(ErrorPayload::ref error, boost::shared_ptr<RosterPayload> rosterPayload);
 			void handleRosterSetError(ErrorPayload::ref error, boost::shared_ptr<RosterPayload> rosterPayload);
 			void applyAllPresenceTo(const JID& jid);
@@ -77,4 +88,8 @@ namespace Swift {
 			void handleSettingChanged(const std::string& settingPath);
 
+			void handleBlockingStateChanged();
+			void handleBlockingItemAdded(const JID& jid);
+			void handleBlockingItemRemoved(const JID& jid);
+
 			JID myJID_;
 			XMPPRoster* xmppRoster_;
@@ -83,4 +98,5 @@ namespace Swift {
 			Roster* roster_;
 			OfflineRosterFilter* offlineFilter_;
+			VCardManager* vcardManager_;
 			AvatarManager* avatarManager_;
 			NickManager* nickManager_;
@@ -95,5 +111,11 @@ namespace Swift {
 			EntityCapsProvider* entityCapsManager_;
 			FileTransferOverview* ftOverview_;
+			ClientBlockListManager* clientBlockListManager_;
+			RosterVCardProvider* rosterVCardProvider_;
+			boost::shared_ptr<ContactRosterItem> ownContact_;
 			
+			boost::bsignals::scoped_connection blockingOnStateChangedConnection_;
+			boost::bsignals::scoped_connection blockingOnItemAddedConnection_;
+			boost::bsignals::scoped_connection blockingOnItemRemovedConnection_;
 			boost::bsignals::scoped_connection changeStatusConnection_;
 			boost::bsignals::scoped_connection signOutConnection_;