1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/isode/stroke/client/Client.java b/src/com/isode/stroke/client/Client.java
index 0ea6ad7..6938225 100644
--- a/src/com/isode/stroke/client/Client.java
+++ b/src/com/isode/stroke/client/Client.java
@@ -4,6 +4,8 @@
  */
 package com.isode.stroke.client;
 
+import com.isode.stroke.avatars.AvatarManager;
+import com.isode.stroke.avatars.AvatarManagerImpl;
 import com.isode.stroke.disco.CapsManager;
 import com.isode.stroke.disco.ClientDiscoManager;
 import com.isode.stroke.disco.EntityCapsManager;
@@ -54,6 +56,7 @@ public class Client extends CoreClient {
     private final NickResolver nickResolver;
     private final SubscriptionManager subscriptionManager;
     private final ClientDiscoManager discoManager;
+    private final AvatarManager avatarManager;
 
     final Signal1<Presence> onPresenceChange = new Signal1<Presence>();
 
@@ -98,6 +101,7 @@ public class Client extends CoreClient {
         mucManager = new MUCManager(getStanzaChannel(), getIQRouter(), directedPresenceSender, mucRegistry);
 
         vcardManager = new VCardManager(jid, getIQRouter(), getStorages().getVCardStorage());
+    	avatarManager = new AvatarManagerImpl(vcardManager, getStanzaChannel(), getStorages().getAvatarStorage(), networkFactories.getCryptoProvider(), mucRegistry);
         capsManager = new CapsManager(getStorages().getCapsStorage(), getStanzaChannel(), getIQRouter(), networkFactories.getCryptoProvider());
         entityCapsManager = new EntityCapsManager(capsManager, getStanzaChannel());
 
@@ -190,6 +194,10 @@ public class Client extends CoreClient {
     	return vcardManager;
     }
     
+    public AvatarManager getAvatarManager() {
+    	return avatarManager;
+    }
+    
     private Storages getStorages()  {
     	if (storages != null) {
     		return storages;