Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/yahoo/yahoo_picture.c	Sat Aug 03 05:38:36 2013 +0530
+++ b/libpurple/protocols/yahoo/yahoo_picture.c	Sun Aug 04 14:34:04 2013 +0530
@@ -49,10 +49,6 @@
 	gpointer _data)
 {
 	struct yahoo_fetch_picture_data *d = _data;
-	YahooData *yd;
-
-	yd = purple_connection_get_protocol_data(d->gc);
-	yd->http_reqs = g_slist_remove(yd->http_reqs, http_conn);
 
 	if (!purple_http_response_is_successfull(response)) {
 		purple_debug_error("yahoo", "Fetching buddy icon failed: %s\n",
@@ -125,16 +121,15 @@
 	/* Yahoo IM 6 spits out 0.png as the URL if the buddy icon is not set */
 	if (who && got_icon_info && url && !g_ascii_strncasecmp(url, "http://", 7)) {
 		/* TODO: make this work p2p, try p2p before the url */
-		PurpleHttpConnection *hc;
 		struct yahoo_fetch_picture_data *data;
 
 		data = g_new0(struct yahoo_fetch_picture_data, 1);
 		data->gc = gc;
 		data->who = g_strdup(who);
 		data->checksum = checksum;
-		hc = purple_http_get(gc, yahoo_fetch_picture_cb, data, url);
 		yd = purple_connection_get_protocol_data(gc);
-		yd->http_reqs = g_slist_prepend(yd->http_reqs, hc);
+		purple_http_connection_set_add(yd->http_reqs, purple_http_get(
+			gc, yahoo_fetch_picture_cb, data, url));
 	} else if (who && send_icon_info) {
 		yahoo_send_picture_info(gc, who);
 	}