8 files changed, 46 insertions, 6 deletions
diff --git a/Swift/Controllers/Roster/ContactRosterItem.cpp b/Swift/Controllers/Roster/ContactRosterItem.cpp
index 0fe88aa..894f64b 100644
--- a/Swift/Controllers/Roster/ContactRosterItem.cpp
+++ b/Swift/Controllers/Roster/ContactRosterItem.cpp
@@ -7,6 +7,8 @@
 #include "Swift/Controllers/Roster/ContactRosterItem.h"
 #include "Swift/Controllers/Roster/GroupRosterItem.h"
 
+#include <Swiften/Base/foreach.h>
+
 namespace Swift {
 
 
diff --git a/Swift/Controllers/Roster/GroupRosterItem.cpp b/Swift/Controllers/Roster/GroupRosterItem.cpp
index f0a377a..2b56d1f 100644
--- a/Swift/Controllers/Roster/GroupRosterItem.cpp
+++ b/Swift/Controllers/Roster/GroupRosterItem.cpp
@@ -12,7 +12,7 @@
 
 namespace Swift {
 
-GroupRosterItem::GroupRosterItem(const std::string& name, GroupRosterItem* parent, bool sortByStatus) : RosterItem(name, parent), sortByStatus_(sortByStatus) {
+GroupRosterItem::GroupRosterItem(const std::string& name, GroupRosterItem* parent, bool sortByStatus) : RosterItem(name, parent), sortByStatus_(sortByStatus), manualSort_(false) {
 	expanded_ = true;
 }
 
@@ -20,6 +20,20 @@ GroupRosterItem::~GroupRosterItem() {
 
 }
 
+void GroupRosterItem::setManualSort(const std::string& manualSortValue) {
+	manualSort_ = true;
+	bool changed = manualSortValue_ != manualSortValue;
+	manualSortValue_ = manualSortValue;
+	if (changed) {
+		onChildrenChanged();
+		onDataChanged();
+	}
+}
+
+const std::string& GroupRosterItem::getSortableDisplayName() const {
+	return manualSort_ ? manualSortValue_ : RosterItem::getSortableDisplayName();
+}
+
 bool GroupRosterItem::isExpanded() const {
 	return expanded_;
 }
@@ -210,7 +224,8 @@ void GroupRosterItem::handleChildrenChanged(GroupRosterItem* group) {
 	} else {
 		displayedChildren_.erase(std::remove(displayedChildren_.begin(), displayedChildren_.end(), group), displayedChildren_.end());
 	}
-	if (oldSize != getDisplayedChildren().size()) {
+
+	if (oldSize != getDisplayedChildren().size() || sortDisplayed()) {
 		onChildrenChanged();
 		onDataChanged();
 	}
diff --git a/Swift/Controllers/Roster/GroupRosterItem.h b/Swift/Controllers/Roster/GroupRosterItem.h
index 57fa9fa..beb7705 100644
--- a/Swift/Controllers/Roster/GroupRosterItem.h
+++ b/Swift/Controllers/Roster/GroupRosterItem.h
@@ -31,6 +31,8 @@ class GroupRosterItem : public RosterItem {
 		void setExpanded(bool expanded);
 		bool isExpanded() const;
 		boost::signal<void (bool)> onExpandedChanged;
+		void setManualSort(const std::string& manualSortValue);
+		virtual const std::string& getSortableDisplayName() const;
 	private:
 		void handleChildrenChanged(GroupRosterItem* group);
 		void handleDataChanged(RosterItem* item);
@@ -40,6 +42,8 @@ class GroupRosterItem : public RosterItem {
 		std::vector<RosterItem*> children_;
 		std::vector<RosterItem*> displayedChildren_;
 		bool sortByStatus_;
+		bool manualSort_;
+		std::string manualSortValue_;
 };
 
 }
diff --git a/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp
index c1045ee..0a242ae 100644
--- a/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp
+++ b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp
@@ -9,6 +9,7 @@
 #include <boost/bind.hpp>
 #include <vector>
 
+#include <Swiften/Base/foreach.h>
 #include "Swiften/Base/String.h"
 #include "Swift/Controllers/Roster/GroupRosterItem.h"
 
diff --git a/Swift/Controllers/Roster/RosterItem.cpp b/Swift/Controllers/Roster/RosterItem.cpp
index 3f130bb..77db8a3 100644
--- a/Swift/Controllers/Roster/RosterItem.cpp
+++ b/Swift/Controllers/Roster/RosterItem.cpp
@@ -33,11 +33,11 @@ void RosterItem::setDisplayName(const std::string& name) {
 	onDataChanged();
 }
 
-std::string RosterItem::getDisplayName() const {
+const std::string& RosterItem::getDisplayName() const {
 	return name_;
 }
 
-std::string RosterItem::getSortableDisplayName() const {
+const std::string& RosterItem::getSortableDisplayName() const {
 	return sortableDisplayName_;
 }
 
diff --git a/Swift/Controllers/Roster/RosterItem.h b/Swift/Controllers/Roster/RosterItem.h
index ed8cb16..769f72d 100644
--- a/Swift/Controllers/Roster/RosterItem.h
+++ b/Swift/Controllers/Roster/RosterItem.h
@@ -20,8 +20,8 @@ class RosterItem {
 		boost::signal<void ()> onDataChanged;
 		GroupRosterItem* getParent() const;
 		void setDisplayName(const std::string& name);
-		std::string getDisplayName() const;
-		std::string getSortableDisplayName() const;
+		const std::string& getDisplayName() const;
+		virtual const std::string& getSortableDisplayName() const;
 	private:
 		std::string name_;
 		std::string sortableDisplayName_;
diff --git a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
index 16f2745..ca74dbb 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
@@ -8,6 +8,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
+#include <Swiften/Base/foreach.h>
 #include "Swift/Controllers/Roster/RosterController.h"
 #include "Swift/Controllers/UnitTest/MockMainWindowFactory.h"
 // #include "Swiften/Elements/Payload.h"
diff --git a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
index cbef787..4444e8a 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
@@ -21,6 +21,7 @@ class RosterTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testRemoveSecondContact);
 		CPPUNIT_TEST(testRemoveSecondContactSameBare);
 		CPPUNIT_TEST(testApplyPresenceLikeMUC);
+		CPPUNIT_TEST(testReSortLikeMUC);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -117,6 +118,22 @@ class RosterTest : public CppUnit::TestFixture {
 
 		}
 
+		void testReSortLikeMUC() {
+			JID jid4a("a@b/c");
+			JID jid4b("a@b/d");
+			JID jid4c("a@b/e");
+			roster_->addContact(jid4a, JID(), "Bird", "group1", "");
+			roster_->addContact(jid4b, JID(), "Cookie", "group2", "");
+			roster_->addContact(jid4b, JID(), "Ernie", "group1", "");
+			roster_->getGroup("group1")->setManualSort("2");
+			roster_->getGroup("group2")->setManualSort("1");
+			GroupRosterItem* root = roster_->getRoot();
+			const std::vector<RosterItem*> kids = root->getDisplayedChildren();
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), kids.size());
+			CPPUNIT_ASSERT_EQUAL(std::string("group2"), kids[0]->getDisplayName());
+			CPPUNIT_ASSERT_EQUAL(std::string("group1"), kids[1]->getDisplayName());
+		}
+
 	private:
 		Roster *roster_;
 		JID jid1_;