pidgin: 60067e3a: jabber: Remove js->use_bosh

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 60067e3aed3e464ae90ea34b5aba54e7f8ae065f
Ancestor: 6e97c2f18b663032c678f13ae4b23f99a6297f35
Author: darkrain42 at pidgin.im
Date: 2009-08-01T04:01:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/60067e3aed3e464ae90ea34b5aba54e7f8ae065f

Modified files:
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h

ChangeLog: 

jabber: Remove js->use_bosh

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/bosh.c	c88e0a468c1106ea63961f5767928ed306654316
+++ libpurple/protocols/jabber/bosh.c	040a1918c4df2b2b8f7846e26d8a5e6e65519c19
@@ -516,7 +516,6 @@ static void boot_response_cb(PurpleBOSHC
 	/* FIXME: Depending on receiving features might break with some hosts */
 	packet = xmlnode_get_child(node, "features");
 	conn->state = BOSH_CONN_ONLINE;
-	conn->js->use_bosh = TRUE;
 	conn->receive_cb = auth_response_cb;
 	jabber_stream_features_parse(conn->js, packet);
 }
============================================================
--- libpurple/protocols/jabber/jabber.c	9b9e35846b402bb243fe994f5f989a21ee00ca10
+++ libpurple/protocols/jabber/jabber.c	244b38b7bac634c50f3c6173de33ec413698fe7c
@@ -441,7 +441,7 @@ void jabber_send_raw(JabberStream *js, c
 	if (len == -1)
 		len = strlen(data);
 
-	if (js->use_bosh)
+	if (js->bosh)
 		jabber_bosh_connection_send_raw(js->bosh, data);
 	else
 		do_jabber_send_raw(js, data, len);
@@ -465,7 +465,7 @@ void jabber_send_signal_cb(PurpleConnect
 		return;
 
 	js = purple_connection_get_protocol_data(pc);
-	if (js->use_bosh)
+	if (js->bosh)
 		if (g_str_equal((*packet)->name, "message") ||
 				g_str_equal((*packet)->name, "iq") ||
 				g_str_equal((*packet)->name, "presence"))
@@ -632,7 +632,6 @@ txt_resolved_cb(GList *responses, gpoint
 		if (!strcmp(token[0], "_xmpp-client-xbosh")) {
 			purple_debug_info("jabber","Found alternative connection method using %s at %s.\n", token[0], token[1]);
 			js->bosh = jabber_bosh_connection_init(js, token[1]);
-			js->use_bosh = TRUE;
 			g_strfreev(token);
 			break;
 		}
@@ -865,7 +864,6 @@ jabber_stream_connect(JabberStream *js)
 	 * attached to that choice, though.
 	 */
 	if (*bosh_url) {
-		js->use_bosh = TRUE;
 		js->bosh = jabber_bosh_connection_init(js, bosh_url);
 		if (js->bosh)
 			jabber_bosh_connection_connect(js->bosh);
@@ -1445,7 +1443,7 @@ void jabber_close(PurpleConnection *gc)
 	 * on some SSL backends.
 	 */
 	if (!gc->disconnect_timeout) {
-		if (js->use_bosh)
+		if (js->bosh)
 			jabber_bosh_connection_close(js->bosh);
 		else if ((js->gsc && js->gsc->fd > 0) || js->fd > 0)
 			jabber_send_raw(js, "</stream:stream>", -1);
============================================================
--- libpurple/protocols/jabber/jabber.h	9564ef082393c764d9942138b860ded2f4076d1b
+++ libpurple/protocols/jabber/jabber.h	4ea229fd0bbd4dc8dff94acd22a861ac853261ec
@@ -253,7 +253,6 @@ struct _JabberStream
 	guint max_srv_rec_idx;
 
 	/* BOSH stuff */
-	gboolean use_bosh;
 	PurpleBOSHConnection *bosh;
 
 	/**