From 88a6da65a7b941191ce3836009af9a0d68b89f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 12 Sep 2010 09:35:36 +0200
Subject: Make signal disconnect in CombinedAvatarProvider portable.


diff --git a/Swiften/Avatars/CombinedAvatarProvider.cpp b/Swiften/Avatars/CombinedAvatarProvider.cpp
index 0e4a704..4f0b04a 100644
--- a/Swiften/Avatars/CombinedAvatarProvider.cpp
+++ b/Swiften/Avatars/CombinedAvatarProvider.cpp
@@ -22,14 +22,14 @@ String CombinedAvatarProvider::getAvatarHash(const JID& jid) const {
 }
 
 void CombinedAvatarProvider::addProvider(AvatarProvider* provider) {
-	provider->onAvatarChanged.connect(reinterpret_cast<int>(this), boost::bind(&CombinedAvatarProvider::handleAvatarChanged, this, _1));
+	provider->onAvatarChanged.connect(boost::bind(&CombinedAvatarProvider::handleAvatarChanged, this, _1));
 	providers.push_back(provider);
 }
 
 void CombinedAvatarProvider::removeProvider(AvatarProvider* provider) {
 	std::vector<AvatarProvider*>::iterator i = std::remove(providers.begin(), providers.end(), provider);
 	for(std::vector<AvatarProvider*>::iterator j = i; j < providers.end(); ++j) {
-		provider->onAvatarChanged.disconnect(reinterpret_cast<int>(this));
+		provider->onAvatarChanged.disconnect(boost::bind(&CombinedAvatarProvider::handleAvatarChanged, this, _1));
 	}
 	providers.erase(i, providers.end());
 }
-- 
cgit v0.10.2-6-g49f6