# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177683910 0
# Node ID e4a1980c0090568cd9c13d8b2b6bb8fe9fabb49b
# Parent  2ae39a05617978e419b11f3487d1e1ef60c6392f
disapproval of revision '2f959ba8a0fdac370ac610e60f6a4cd09525d928'

diff -r 2ae39a056179 -r e4a1980c0090 libpurple/imgstore.c
--- a/libpurple/imgstore.c	Fri Apr 27 05:32:49 2007 +0000
+++ b/libpurple/imgstore.c	Fri Apr 27 14:25:10 2007 +0000
@@ -71,13 +71,13 @@
 	PurpleStoredImage *img = purple_imgstore_add(data, size, filename);
 	img->id = ++nextid;
 
-	g_hash_table_insert(imgstore, &(img->id), img);
+	g_hash_table_insert(imgstore, GINT_TO_POINTER(img->id), img);
 
 	return img->id;
 }
 
 PurpleStoredImage *purple_imgstore_find_by_id(int id) {
-	PurpleStoredImage *img = g_hash_table_lookup(imgstore, &id);
+	PurpleStoredImage *img = g_hash_table_lookup(imgstore, GINT_TO_POINTER(id));
 
 	if (img != NULL)
 		purple_debug_misc("imgstore", "retrieved image id %d\n", img->id);
@@ -155,7 +155,7 @@
 		purple_signal_emit(purple_imgstore_get_handle(),
 		                   "image-deleting", img);
 		if (img->id)
-			g_hash_table_remove(imgstore, &img->id);
+			g_hash_table_remove(imgstore, GINT_TO_POINTER(img->id));
 
 		g_free(img->data);
 		g_free(img->filename);
diff -r 2ae39a056179 -r e4a1980c0090 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Fri Apr 27 05:32:49 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Fri Apr 27 14:25:10 2007 +0000
@@ -955,23 +955,22 @@
 					gboolean photo = (strcmp(child->name, "PHOTO") == 0);
 
 					data = purple_base64_decode(bintext, &size);
-					if (data) {
-						jbi->vcard_imgids = g_slist_prepend(jbi->vcard_imgids, GINT_TO_POINTER(purple_imgstore_add_with_id(g_memdup(data, size), size, "logo.png")));
-						g_string_append_printf(info_text,
-								"<b>%s:</b> <img id='%d'><br/>",
-								photo ? _("Photo") : _("Logo"),
-								GPOINTER_TO_INT(jbi->vcard_imgids->data));
-	
-						purple_cipher_digest_region("sha1", (guchar *)data, size,
-								sizeof(hashval), hashval, NULL);
-						p = hash;
-						for(i=0; i<20; i++, p+=2)
-							snprintf(p, 3, "%02x", hashval[i]);
+
+					jbi->vcard_imgids = g_slist_prepend(jbi->vcard_imgids, GINT_TO_POINTER(purple_imgstore_add_with_id(g_memdup(data, size), size, "logo.png")));
+					g_string_append_printf(info_text,
+							"<b>%s:</b> <img id='%d'><br/>",
+							photo ? _("Photo") : _("Logo"),
+							GPOINTER_TO_INT(jbi->vcard_imgids->data));
 
-						purple_buddy_icons_set_for_user(js->gc->account, bare_jid,
-								data, size, hash);
-						g_free(bintext);
-					}
+					purple_cipher_digest_region("sha1", (guchar *)data, size,
+							sizeof(hashval), hashval, NULL);
+					p = hash;
+					for(i=0; i<20; i++, p+=2)
+						snprintf(p, 3, "%02x", hashval[i]);
+
+					purple_buddy_icons_set_for_user(js->gc->account, bare_jid,
+							data, size, hash);
+					g_free(bintext);
 				}
 			}
 			g_free(text);