20080507153450-53eee-4374c795a9bc49ab879695016baf2916a768f01c.gz
---
src/presence-cache.c | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/presence-cache.c b/src/presence-cache.c
index b645b14..b689975 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -596,22 +596,16 @@ _grab_avatar_sha1 (GabblePresenceCache *cache,
g_free (presence->avatar_sha1);
presence->avatar_sha1 = g_strdup (sha1);
-#if 0
- if (handle == priv->conn->parent.self_handle)
- {
- /* that would be us, then. According to XEP-0153, we MUST
- * immediately send a presence update with an empty update child
- * element (no photo node), then re-download our own vCard;
- * when that arrives, we may start setting the photo node in our
- * presence again.
- *
- * For the moment I'm going to ignore that requirement and
- * trust that our other resource is getting its sha1 right!
- */
- /* TODO: I don't trust anyone to get XMPP right, so let's do
- * this. :D */
- }
-#endif
+ /* FIXME: according to XEP-0153,
+ * if (handle == priv->conn->parent.self_handle), then we MUST
+ * immediately send a presence update with an empty update child
+ * element (no photo node), then re-download our own vCard;
+ * when that arrives, we may start setting the photo node in our
+ * presence again.
+ *
+ * At the moment we ignore that requirement and trust that our other
+ * resource is getting its sha1 right - but it's a good policy to not
+ * trust anyone's XMPP implementation :-) */
g_signal_emit (cache, signals[AVATAR_UPDATE], 0, handle);
}
--
1.5.6.3