summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-07-07 13:50:32 (GMT)
committerRichard Maudsley <richard.maudsley@isode.com>2014-07-07 14:03:19 (GMT)
commitb4fe7ad5c1036b1d24470d9f8e0888faf582530a (patch)
treed119196d2d690d747b05d70fdbcbf03b6433a11b /Swift/Controllers
parent14fd8e4363241e04b20da85dfc61e5f315e9b28d (diff)
downloadswift-b4fe7ad5c1036b1d24470d9f8e0888faf582530a.zip
swift-b4fe7ad5c1036b1d24470d9f8e0888faf582530a.tar.bz2
Fix other user avatars appearing in roster tooltip.
Test-Information: Reproduce bug by cycling MUC and confirm that another users avatar is visible in the tooltip. Apply this patch and check that only the users own avatar is displayed in the tooltip. Change-Id: I0e9ea44ce408ac445df9c089ce76556ae74e4394
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/Roster/RosterController.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Roster/RosterController.cpp b/Swift/Controllers/Roster/RosterController.cpp
index 6bb5119..ecca9fe 100644
--- a/Swift/Controllers/Roster/RosterController.cpp
+++ b/Swift/Controllers/Roster/RosterController.cpp
@@ -352,9 +352,9 @@ void RosterController::handleAvatarChanged(const JID& jid) {
roster_->applyOnItems(SetAvatar(jid, path));
if (jid.equals(myJID_, JID::WithResource)) {
mainWindow_->setMyAvatarPath(pathToString(path));
+ ownContact_->setAvatarPath(pathToString(path));
+ mainWindow_->setMyContactRosterItem(ownContact_);
}
- ownContact_->setAvatarPath(pathToString(path));
- mainWindow_->setMyContactRosterItem(ownContact_);
}
void RosterController::handlePresenceChanged(Presence::ref presence) {