Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/buddy.c	Wed Sep 28 15:45:37 2016 -0500
+++ b/libpurple/protocols/jabber/buddy.c	Thu Sep 29 20:09:55 2016 -0500
@@ -472,9 +472,10 @@
 		g_free(js->initial_avatar_hash);
 		image = purple_buddy_icons_find_account_icon(purple_connection_get_account(gc));
 		if (image != NULL) {
-			js->initial_avatar_hash = jabber_calculate_data_hash(
+			js->initial_avatar_hash = g_compute_checksum_for_data(
+				G_CHECKSUM_SHA1,
 				purple_image_get_data(image),
-				purple_image_get_size(image), "sha1");
+				purple_image_get_size(image));
 			g_object_unref(image);
 		} else {
 			js->initial_avatar_hash = NULL;
@@ -528,8 +529,8 @@
 		binval = purple_xmlnode_new_child(photo, "BINVAL");
 		enc = purple_base64_encode(avatar_data, avatar_len);
 
-		js->avatar_hash =
-			jabber_calculate_data_hash(avatar_data, avatar_len, "sha1");
+		js->avatar_hash = g_compute_checksum_for_data(G_CHECKSUM_SHA1,
+			avatar_data, avatar_len);
 
 		purple_xmlnode_insert_data(binval, enc, -1);
 		g_free(enc);
@@ -959,7 +960,8 @@
 			g_free(bintext);
 
 			if (data) {
-				vcard_hash = jabber_calculate_data_hash(data, size, "sha1");
+				vcard_hash = g_compute_checksum_for_data(
+					G_CHECKSUM_SHA1, data, size);
 				g_free(data);
 			}
 		}
@@ -1214,7 +1216,7 @@
 
 						purple_notify_user_info_add_pair_html(user_info, (photo ? _("Photo") : _("Logo")), img_text);
 
-						hash = jabber_calculate_data_hash(data, size, "sha1");
+						hash = g_compute_checksum_for_data(G_CHECKSUM_SHA1, data, size);
 						purple_buddy_icons_set_for_user(account, bare_jid, data, size, hash);
 						g_free(hash);
 						g_free(img_text);