summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-04-13 07:38:37 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-04-13 07:38:37 (GMT)
commit59d973448045888d2ffa8e5cd949357d9c93ead3 (patch)
tree0d3426f6e7d2cccdc41a3d968a0062f687425e09 /Swift/Controllers
parent944d3e817919d26e3fbf92f3c9eab6bbe9a1d2ca (diff)
downloadswift-59d973448045888d2ffa8e5cd949357d9c93ead3.zip
swift-59d973448045888d2ffa8e5cd949357d9c93ead3.tar.bz2
Don't lose presence when receiving a roster item rename push
Resolves: #312
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/RosterController.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/Swift/Controllers/RosterController.cpp b/Swift/Controllers/RosterController.cpp
index c9ba612..17fd2e9 100644
--- a/Swift/Controllers/RosterController.cpp
+++ b/Swift/Controllers/RosterController.cpp
@@ -23,6 +23,7 @@
#include "Swiften/Roster/SetPresence.h"
#include "Swiften/Roster/AppearOffline.h"
#include "Swiften/Roster/SetAvatar.h"
+#include "Swiften/Roster/SetName.h"
#include "Swiften/Roster/OfflineRosterFilter.h"
#include "Swiften/Roster/OpenChatRosterAction.h"
#include "Swiften/Roster/TreeWidgetFactory.h"
@@ -144,9 +145,7 @@ void RosterController::handleOnJIDRemoved(const JID& jid) {
void RosterController::handleOnJIDUpdated(const JID& jid, const String& oldName, const std::vector<String> passedOldGroups) {
if (oldName != xmppRoster_->getNameForJID(jid)) {
- handleOnJIDRemoved(jid);
- handleOnJIDAdded(jid);
- //FIXME: use a roster visitor to avoid losing presence.
+ roster_->applyOnItems(SetName(xmppRoster_->getNameForJID(jid), jid));
return;
}
std::vector<String> groups = xmppRoster_->getGroupsForJID(jid);