[telepathy-gabble/telepathy-gabble-0.8] Do not invalidate the cache when we receive our own vCard after conflict resolution

[Alban Crequy]

---
 src/conn-avatars.c   |    2 --
 src/presence-cache.c |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/conn-avatars.c b/src/conn-avatars.c
index 4ebcdaa..557d082 100644
--- a/src/conn-avatars.c
+++ b/src/conn-avatars.c
@@ -83,8 +83,6 @@ connection_avatar_update_cb (GabblePresenceCache *cache,
   GabbleConnection *conn = GABBLE_CONNECTION (user_data);
   TpBaseConnection *base = (TpBaseConnection *) conn;
 
-  gabble_vcard_manager_invalidate_cache (conn->vcard_manager, handle);
-
   if (handle == base->self_handle)
     update_own_avatar_sha1 (conn, sha1, NULL);
   else
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 36037ef..b330b79 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -779,6 +779,7 @@ _grab_avatar_sha1 (GabblePresenceCache *cache,
       else
         {
           presence->avatar_sha1 = g_strdup (sha1);
+          gabble_vcard_manager_invalidate_cache (priv->conn->vcard_manager, handle);
           g_signal_emit (cache, signals[AVATAR_UPDATE], 0, handle, sha1);
         }
     }
-- 
1.5.6.5