diff libpurple/protocols/jabber/jabber.c @ 30926:196e4c5b2043

Some unfinished code to take advantage of Google's relays

--- a/libpurple/protocols/jabber/jabber.c	Mon Aug 31 20:10:35 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Aug 31 20:23:51 2009 +0000
@@ -842,6 +842,9 @@
 	js->stun_ip = NULL;
 	js->stun_port = 0;
 	js->stun_query = NULL;
+	js->google_relay_token = NULL;
+	js->google_relay_host = NULL;
+	js->google_relay_request = 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
@@ -1563,6 +1566,15 @@
 		js->stun_query = NULL;
 	}
 
+	/* remove Google relay-related stuff */
+	g_free(js->google_relay_token);
+	g_free(js->google_relay_host);
+
+	if (js->google_relay_request != NULL) {
+		purple_util_fetch_url_cancel(js->google_relay_request);
+		js->google_relay_request = NULL;
+	}
+
 	g_free(js);
 
 	gc->proto_data = NULL;
@@ -3021,6 +3033,9 @@
 		jbr = jabber_buddy_find_resource(jb, resource);
 		g_free(resource);
 
+		/*
+		return jabber_google_session_initiate(js, who, type);
+		*/
 		if (type & PURPLE_MEDIA_AUDIO &&
 				!jabber_resource_has_capability(jbr,
 				JINGLE_APP_RTP_SUPPORT_AUDIO) &&