1 files changed, 15 insertions, 4 deletions
diff --git a/Swift/Controllers/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index 4e34105..83837b1 100644
--- a/Swift/Controllers/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -17,6 +17,7 @@
 #include <boost/bind.hpp>
 
 #include <iostream>
+#include <set>
 #include <deque>
 
 namespace Swift {
@@ -60,6 +61,16 @@ GroupRosterItem* Roster::getGroup(const std::string& groupName) {
 	return group;
 }
 
+void Roster::setAvailableFeatures(const JID& jid, const std::set<ContactRosterItem::Feature>& features) {
+	JID actualJID = fullJIDMapping_ ? jid : jid.toBare();
+	if (itemMap_[actualJID].empty()) {
+		return;
+	}
+	foreach(ContactRosterItem* item, itemMap_[actualJID]) {
+		item->setSupportedFeatures(features);
+	}
+}
+
 void Roster::removeGroup(const std::string& group) {
 	root_->removeGroupChild(group);
 }
@@ -74,7 +85,7 @@ void Roster::handleChildrenChanged(GroupRosterItem* item) {
 
 void Roster::addContact(const JID& jid, const JID& displayJID, const std::string& name, const std::string& groupName, const std::string& avatarPath) {
 	GroupRosterItem* group(getGroup(groupName));
-	ContactRosterItem *item = new ContactRosterItem(jid, displayJID, name, group);
+	ContactRosterItem *item = new ContactRosterItem(jid, displayJID, name, group);	
 	item->setAvatarPath(avatarPath);
 	group->addChild(item);
 	if (itemMap_[fullJIDMapping_ ? jid : jid.toBare()].size() > 0) {
@@ -107,7 +118,7 @@ void Roster::removeAll() {
 void Roster::removeContact(const JID& jid) {
 	std::vector<ContactRosterItem*>* items = &itemMap_[fullJIDMapping_ ? jid : jid.toBare()];
 	items->erase(std::remove_if(items->begin(), items->end(), JIDEqualsTo(jid)), items->end());
-	if (items->size() == 0) {
+	if (items->empty()) {
 		itemMap_.erase(fullJIDMapping_ ? jid : jid.toBare());
 	}
 	//Causes the delete
@@ -124,7 +135,7 @@ void Roster::removeContactFromGroup(const JID& jid, const std::string& groupName
 			std::vector<ContactRosterItem*>* items = &itemMap_[fullJIDMapping_ ? jid : jid.toBare()];
 			items->erase(std::remove(items->begin(), items->end(), deleted), items->end());
 		}
-		it++;
+		++it;
 	}
 	foreach (ContactRosterItem* item, itemMap_[fullJIDMapping_ ? jid : jid.toBare()]) {
 		item->removeGroup(groupName);
@@ -179,7 +190,7 @@ void Roster::filterContact(ContactRosterItem* contact, GroupRosterItem* group) {
 	foreach (RosterFilter *filter, filters_) {
 		hide &= (*filter)(contact);
 	}
-	group->setDisplayed(contact, filters_.size() == 0 || !hide);
+	group->setDisplayed(contact, filters_.empty() || !hide);
 	int newDisplayedSize = group->getDisplayedChildren().size();
 	if (oldDisplayedSize == 0 && newDisplayedSize > 0) {
 		onGroupAdded(group);