2 files changed, 12 insertions, 3 deletions
diff --git a/Swift/Controllers/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index 44cf03d..4dbc453 100644
--- a/Swift/Controllers/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -165,78 +165,85 @@ void Roster::removeContactFromGroup(const JID& jid, const std::string& groupName
 
 void Roster::applyOnItems(const RosterItemOperation& operation) {
 	if (operation.requiresLookup()) {
 		applyOnItem(operation, operation.lookupJID());
 	} else {
 		applyOnAllItems(operation);
 	}
 }
 
 void Roster::applyOnItem(const RosterItemOperation& operation, const JID& jid) {
 	ItemMap::iterator i = itemMap_.find(fullJIDMapping_ ? jid : jid.toBare());
 	if (i == itemMap_.end()) {
 		return;
 	}
 	foreach (ContactRosterItem* item, i->second) {
 		operation(item);
 		filterContact(item, item->getParent());
 	}
 }
 
 void Roster::applyOnAllItems(const RosterItemOperation& operation) {
 	std::deque<RosterItem*> queue;
 	queue.push_back(root_);
 	while (!queue.empty()) {
 		RosterItem* item = *queue.begin();
 		queue.pop_front();
 		operation(item);
 		GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item);
 		if (group) {
 			queue.insert(queue.begin(), group->getChildren().begin(), group->getChildren().end());
 		}
 	}
 	filterAll();
 }
 
-void Roster::removeFilter(RosterFilter *filter) {
+void Roster::addFilter(RosterFilter* filter) {
+	filters_.push_back(filter);
+	filterAll();
+	onFilterAdded(filter);
+}
+
+void Roster::removeFilter(RosterFilter* filter) {
 	for (unsigned int i = 0; i < filters_.size(); i++) {
 		if (filters_[i] == filter) {
 			filters_.erase(filters_.begin() + i);
 			break;
 		}
 	}
 	filterAll();
+	onFilterRemoved(filter);
 }
 
 void Roster::filterContact(ContactRosterItem* contact, GroupRosterItem* group) {
 	size_t oldDisplayedSize = group->getDisplayedChildren().size();
 	bool hide = true;
 	foreach (RosterFilter *filter, filters_) {
 		hide &= (*filter)(contact);
 	}
 	group->setDisplayed(contact, filters_.empty() || !hide);
 	size_t newDisplayedSize = group->getDisplayedChildren().size();
 	if (oldDisplayedSize == 0 && newDisplayedSize > 0) {
 		onGroupAdded(group);
 	}
 }
 
 void Roster::filterGroup(GroupRosterItem* group) {
 	foreach (RosterItem* child, group->getChildren()) {
 		ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(child);
 		if (contact) {
 			filterContact(contact, group);
 		}
 	}
 }
 
 void Roster::filterAll() {
 	std::deque<RosterItem*> queue;
 	queue.push_back(root_);
 	while (!queue.empty()) {
 		RosterItem *item = *queue.begin();
 		queue.pop_front();
 		GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item);
 		if (group) {
 			queue.insert(queue.begin(), group->getChildren().begin(), group->getChildren().end());
 			filterGroup(group);
 		}
diff --git a/Swift/Controllers/Roster/Roster.h b/Swift/Controllers/Roster/Roster.h
index b60eafa..9956cb9 100644
--- a/Swift/Controllers/Roster/Roster.h
+++ b/Swift/Controllers/Roster/Roster.h
@@ -6,62 +6,64 @@
 
 #pragma once
 
 #include <string>
 #include <vector>
 #include <map>
 
 #include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
 #include <Swift/Controllers/Roster/RosterFilter.h>
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
 
 namespace Swift {
 
 class RosterItem;
 class GroupRosterItem;
 class ContactRosterItem;
 
 class Roster {
 	public:
 		Roster(bool sortByStatus = true, bool fullJIDMapping = false);
 		~Roster();
 
 		void addContact(const JID& jid, const JID& displayJID, const std::string& name, const std::string& group, const boost::filesystem::path& avatarPath);
 		void removeContact(const JID& jid);
 		void removeContactFromGroup(const JID& jid, const std::string& group);
 		void removeGroup(const std::string& group);
 		void removeAll();
 		void applyOnItems(const RosterItemOperation& operation);
 		void applyOnAllItems(const RosterItemOperation& operation);
 		void applyOnItem(const RosterItemOperation& operation, const JID& jid);
-		void addFilter(RosterFilter *filter) {filters_.push_back(filter);filterAll();}
-		void removeFilter(RosterFilter *filter);
+		void addFilter(RosterFilter* filter);
+		void removeFilter(RosterFilter* filter);
 		GroupRosterItem* getRoot();
 		std::vector<RosterFilter*> getFilters() {return filters_;}
 		boost::signal<void (GroupRosterItem*)> onChildrenChanged;
 		boost::signal<void (GroupRosterItem*)> onGroupAdded;
 		boost::signal<void (RosterItem*)> onDataChanged;
 		boost::signal<void (JID&)> onVCardUpdateRequested;
+		boost::signal<void (RosterFilter* filter)> onFilterAdded;
+		boost::signal<void (RosterFilter* filter)> onFilterRemoved;
 		GroupRosterItem* getGroup(const std::string& groupName);
 		void setBlockingSupported(bool isSupported);
 
 	private:
 		void handleDataChanged(RosterItem* item);
 		void handleChildrenChanged(GroupRosterItem* item);
 		void filterGroup(GroupRosterItem* item);
 		void filterContact(ContactRosterItem* contact, GroupRosterItem* group);
 		void filterAll();
 		GroupRosterItem* root_;
 		std::vector<RosterFilter*> filters_;
 		typedef std::map<JID, std::vector<ContactRosterItem*> > ItemMap;
 		ItemMap itemMap_;
 		bool fullJIDMapping_;
 		bool sortByStatus_;
 		bool blockingSupported_;
 };
 
 }