Construct image hash directly, rather than with purple_util_get_image_filename to allow building with libpurple 2.0

20070801232713-984d1-74b0e02f38d1112b24f498e63213456915e355e5.gz

1 files changed, 26 insertions, 1 deletions

diff --git a/src/connection-avatars.c b/src/connection-avatars.c
index 7e0ec40..e0e317b 100644
--- a/src/connection-avatars.c
+++ b/src/connection-avatars.c
@@ -1,5 +1,7 @@
 #include <telepathy-glib/svc-connection.h>
 
+#include <cipher.h>
+
 #include "connection-avatars.h"
 #include "connection.h"
 
@@ -87,7 +89,30 @@ get_token (const GArray *avatar)
 
     if (avatar)
     {
-        token = purple_util_get_image_filename (avatar->data, avatar->len);
+        /* Taken mostly verbatim from purple_util_get_image_filename; this copy
+         * does not append a file extension to the hash, and also works with
+         * libpurple 2.0
+         */
+        PurpleCipherContext *context;
+        gchar digest[41];
+
+        context = purple_cipher_context_new_by_name("sha1", NULL);
+        if (context == NULL)
+        {
+            g_error ("Could not find libpurple's sha1 cipher");
+        }
+
+        /* Hash the image data */
+        purple_cipher_context_append(context, (const guchar *) avatar->data,
+                                     avatar->len);
+        if (!purple_cipher_context_digest_to_str(context, sizeof(digest),
+                                                 digest, NULL))
+        {
+            g_error ("Failed to get SHA-1 digest");
+        }
+        purple_cipher_context_destroy(context);
+
+        token = g_strdup (digest);
     }
     else
     {