pidgin: 03d14096: Two changes:

markdoliner at pidgin.im markdoliner at pidgin.im
Fri Dec 18 21:35:50 EST 2009


-----------------------------------------------------------------
Revision: 03d1409613057bd402e5659d936f59a6d201a93e
Ancestor: de09e9471b5b68fe92d9050716f443aea79bdb00
Author: markdoliner at pidgin.im
Date: 2009-12-19T02:33:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/03d1409613057bd402e5659d936f59a6d201a93e

Modified files:
        libpurple/protocols/myspace/user.c

ChangeLog: 

Two changes:
1. If we're about to make another request to fetch an icon then cancel
   the first one (if it exists)
2. When freeing a buddy, only attempt to cancel a url request if it is non-NULL

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/user.c	e18acc6e994e53087fa429059fd3a4332a414d9a
+++ libpurple/protocols/myspace/user.c	c5e716b2bc661bb7f1b5fe5b17fc96259f55a29a
@@ -70,7 +70,8 @@ void msim_user_free(MsimUser *user)
 	if (!user)
 		return;
 
-	purple_util_fetch_url_cancel(user->url_data);
+	if (user->url_data != NULL)
+		purple_util_fetch_url_cancel(user->url_data);
 
 	g_free(user->client_info);
 	g_free(user->gender);
@@ -379,6 +380,8 @@ msim_store_user_info_each(const gchar *k
 
 		/* Only download if URL changed */
 		if (!previous_url || !g_str_equal(previous_url, user->image_url)) {
+			if (user->url_data != NULL)
+				purple_util_fetch_url_cancel(user->url_data);
 			user->url_data = purple_util_fetch_url(user->image_url, TRUE, NULL, TRUE, msim_downloaded_buddy_icon, (gpointer)user);
 		}
 	} else if (g_str_equal(key_str, "LastImageUpdated")) {


More information about the Commits mailing list