summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-09-09 13:20:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-09-11 21:53:44 (GMT)
commit904db4e398210192093b688ebf1ad66fb017b6d2 (patch)
tree083f01449f64dc27aff63e2be0aa00a73cbd511b /Swiften/Avatars/AvatarManager.h
parent10d8ba50a9e09517cfe4a6d4c3d51a768e989125 (diff)
downloadswift-904db4e398210192093b688ebf1ad66fb017b6d2.zip
swift-904db4e398210192093b688ebf1ad66fb017b6d2.tar.bz2
Added CombinedAvatarProvider
Diffstat (limited to 'Swiften/Avatars/AvatarManager.h')
-rw-r--r--Swiften/Avatars/AvatarManager.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/Swiften/Avatars/AvatarManager.h b/Swiften/Avatars/AvatarManager.h
index d3cdbae..04ce496 100644
--- a/Swiften/Avatars/AvatarManager.h
+++ b/Swiften/Avatars/AvatarManager.h
@@ -16,6 +16,7 @@
#include "Swiften/Elements/Presence.h"
#include "Swiften/Elements/VCard.h"
#include "Swiften/Elements/ErrorPayload.h"
+#include "Swiften/Avatars/CombinedAvatarProvider.h"
namespace Swift {
class MUCRegistry;
@@ -35,6 +36,7 @@ namespace Swift {
boost::signal<void (const JID&)> onAvatarChanged;
private:
+ CombinedAvatarProvider combinedAvatarProvider;
VCardUpdateAvatarManager* vcardUpdateAvatarManager;
AvatarStorage* avatarStorage;
};