[telepathy-gabble/telepathy-gabble-0.8] presence-cache.c: Fix avatar conflict resolution: Do not confuse self_presence and presence with self_handle from the cache

[Alban Crequy]

---
 src/presence-cache.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/presence-cache.c b/src/presence-cache.c
index dc04652..e419379 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -668,7 +668,10 @@ _grab_avatar_sha1 (GabblePresenceCache *cache,
   LmMessageNode *x_node, *photo_node;
   GabblePresence *presence;
 
-  presence = gabble_presence_cache_get (cache, handle);
+  if (handle == base_conn->self_handle)
+    presence = priv->conn->self_presence;
+  else
+    presence = gabble_presence_cache_get (cache, handle);
 
   if (NULL == presence)
     return;
-- 
1.5.6.5