# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1254081884 0
# Node ID 7a145934132faf35018f2e0014188babc3298f9a
# Parent  bcf1e4fe2a89a529905f5d5705c4592c63f83295
Cancel ongoing Google relay request when signing out

diff -r bcf1e4fe2a89 -r 7a145934132f libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Sat Sep 26 11:21:13 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Sun Sep 27 20:04:44 2009 +0000
@@ -545,7 +545,9 @@
 	GList *video_codecs = NULL;
 	GList *codecs = NULL;
 	JabberIq *result;
-	
+
+	js->google_relay_request = NULL;
+
 	if (url_text && len > 0) {
 		purple_debug_info("jabber", "got Google relay request response:\n%s\n",
 			url_text);
diff -r bcf1e4fe2a89 -r 7a145934132f libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sat Sep 26 11:21:13 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sun Sep 27 20:04:44 2009 +0000
@@ -1569,6 +1569,10 @@
 	/* remove Google relay-related stuff */
 	g_free(js->google_relay_token);
 	g_free(js->google_relay_host);
+	if (js->google_relay_request) {
+		purple_util_fetch_url_cancel(js->google_relay_request);
+		js->google_relay_request = NULL;
+	}
 
 	if (js->google_relay_request != NULL) {
 		purple_util_fetch_url_cancel(js->google_relay_request);