Mercurial > pidgin
changeset 27787:53f0956f76dc
jabber: Remove js->use_bosh
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 01 Aug 2009 04:01:51 +0000 |
| parents | 0f79a7b6e856 |
| children | 46e80810b095 |
| files | libpurple/protocols/jabber/bosh.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/jabber.h |
| diffstat | 3 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/bosh.c Sat Aug 01 04:00:37 2009 +0000 +++ b/libpurple/protocols/jabber/bosh.c Sat Aug 01 04:01:51 2009 +0000 @@ -516,7 +516,6 @@ /* 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); }
--- a/libpurple/protocols/jabber/jabber.c Sat Aug 01 04:00:37 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Aug 01 04:01:51 2009 +0000 @@ -441,7 +441,7 @@ 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 @@ 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 @@ 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 @@ * 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 @@ * 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);