Mercurial > pidgin
changeset 26988:bc01e0789404
merge of '48605797160fa0786446ea54f38b8b1e963b9f84'
and 'cf42e14aa9bf1886fae4e840cc02302a0cde8caf'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 30 May 2009 00:34:56 +0000 |
| parents | f303787f144d (current diff) cd78ea46e9bd (diff) |
| children | 077eae6f3d84 |
| files | |
| diffstat | 3 files changed, 0 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sat May 30 00:07:50 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat May 30 00:34:56 2009 +0000 @@ -84,10 +84,6 @@ "xmlns:stream='http://etherx.jabber.org/streams' " "version='1.0'>", js->user->domain); - if (js->reinit) - /* Close down the current stream to keep the XML parser happy */ - jabber_parser_close_stream(js); - /* setup the parser fresh for each stream */ jabber_parser_setup(js); jabber_send_raw(js, open_stream, -1); @@ -687,9 +683,6 @@ static void tls_init(JabberStream *js) { - /* Close down the current stream to keep the XML parser happy */ - jabber_parser_close_stream(js); - purple_input_remove(js->gc->inpa); js->gc->inpa = 0; js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
--- a/libpurple/protocols/jabber/parser.c Sat May 30 00:07:50 2009 +0000 +++ b/libpurple/protocols/jabber/parser.c Sat May 30 00:34:56 2009 +0000 @@ -207,12 +207,6 @@ jabber_parser_free(js); } -void -jabber_parser_close_stream(JabberStream *js) -{ - xmlParseChunk(js->context, "</stream:stream>", 16 /* length */, 0); -} - void jabber_parser_free(JabberStream *js) { if (js->context) { xmlParseChunk(js->context, NULL,0,1);
--- a/libpurple/protocols/jabber/parser.h Sat May 30 00:07:50 2009 +0000 +++ b/libpurple/protocols/jabber/parser.h Sat May 30 00:34:56 2009 +0000 @@ -25,7 +25,6 @@ #include "jabber.h" void jabber_parser_setup(JabberStream *js); -void jabber_parser_close_stream(JabberStream *js); void jabber_parser_free(JabberStream *js); void jabber_parser_process(JabberStream *js, const char *buf, int len);