summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-09-09 11:04:52 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-09-11 21:53:44 (GMT)
commit10d8ba50a9e09517cfe4a6d4c3d51a768e989125 (patch)
tree33e3fb87c07cdf26c91e8146335e41a167aa1bd6 /Swift/Controllers/RosterController.cpp
parent6f31cc8a329d15767d54511edd14339ac3dfdd7a (diff)
downloadswift-10d8ba50a9e09517cfe4a6d4c3d51a768e989125.zip
swift-10d8ba50a9e09517cfe4a6d4c3d51a768e989125.tar.bz2
Refactoring VCardUpdateAvatarManager.
Diffstat (limited to 'Swift/Controllers/RosterController.cpp')
-rw-r--r--Swift/Controllers/RosterController.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/RosterController.cpp b/Swift/Controllers/RosterController.cpp
index 87b0b74..b4626fb 100644
--- a/Swift/Controllers/RosterController.cpp
+++ b/Swift/Controllers/RosterController.cpp
@@ -83,7 +83,7 @@ void RosterController::setAvatarManager(AvatarManager* avatarManager) {
}
avatarManager_ = avatarManager;
if (avatarManager != NULL) {
- avatarManager_->onAvatarChanged.connect(boost::bind(&RosterController::handleAvatarChanged, this, _1, _2));
+ avatarManager_->onAvatarChanged.connect(boost::bind(&RosterController::handleAvatarChanged, this, _1));
mainWindow_->setMyAvatarPath(avatarManager_->getAvatarPath(myJID_).string());
}
}
@@ -221,7 +221,7 @@ void RosterController::handleSubscriptionRequestDeclined(SubscriptionRequestEven
presenceOracle_->cancelSubscription(event->getJID());
}
-void RosterController::handleAvatarChanged(const JID& jid, const String&) {
+void RosterController::handleAvatarChanged(const JID& jid) {
String path = avatarManager_->getAvatarPath(jid).string();
roster_->applyOnItems(SetAvatar(jid, path));
if (jid.equals(myJID_, JID::WithoutResource)) {