Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jabber.c	Fri Jul 05 23:19:08 2013 +0530
+++ b/libpurple/protocols/jabber/jabber.c	Fri Jul 05 23:31:34 2013 +0530
@@ -44,7 +44,6 @@
 #include "util.h"
 #include "version.h"
 #include "xmlnode.h"
-#include "obsolete.h"
 
 #include "auth.h"
 #include "buddy.h"
@@ -1010,7 +1009,6 @@
 	js->stun_query = NULL;
 	js->google_relay_token = NULL;
 	js->google_relay_host = NULL;
-	js->google_relay_requests = NULL;
 
 	/* if we are idle, set idle-ness on the stream (this could happen if we get
 		disconnected and the reconnects while being idle. I don't think it makes
@@ -1714,17 +1712,6 @@
 	/* remove Google relay-related stuff */
 	g_free(js->google_relay_token);
 	g_free(js->google_relay_host);
-	if (js->google_relay_requests) {
-		while (js->google_relay_requests) {
-			PurpleUtilFetchUrlData *url_data =
-				(PurpleUtilFetchUrlData *) js->google_relay_requests->data;
-			purple_util_fetch_url_cancel(url_data);
-			g_free(url_data);
-			js->google_relay_requests =
-				g_list_delete_link(js->google_relay_requests,
-					js->google_relay_requests);
-		}
-	}
 
 	g_free(js);