# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1154978622 0
# Node ID 96ef9966aa249df3a858dd8c0b72276e026e76d0
# Parent  d178bff33359428be84bd6de4bf5853cde5e2427
[gaim-migrate @ 16666]
When not connecting with "Use TLS (if available)" enabled, it's still possible to reach the JABBER_STREAM_REINITIALIZING connection stage.  This is step 4 of the 5-step non-SSL connection process.  In this situation, jabber_recv_cb_ssl() won't be called, so the delayed reintialization via js_>reinit being TRUE never occurs.  jabber_stream_init() is immediately called in that situation.

This may cause the same problems when using libxml which js->reinit was introduced to fix in [16585].  I'm not using libxml, so I couldn't test that... if so, a check against js->reinit and a subsequent jabber_stream_init() call is needed somewhere in the connection path taken when not using SSL.

committer: Tailor Script <tailor@pidgin.im>

diff -r d178bff33359 -r 96ef9966aa24 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Mon Aug 07 17:16:54 2006 +0000
+++ b/src/protocols/jabber/jabber.c	Mon Aug 07 19:23:42 2006 +0000
@@ -1011,8 +1011,13 @@
 			break;
 		case JABBER_STREAM_REINITIALIZING:
 			gaim_connection_update_progress(js->gc, _("Re-initializing Stream"),
-					6, JABBER_CONNECT_STEPS);
-			js->reinit = TRUE;
+					(js->gsc ? 7 : 4), JABBER_CONNECT_STEPS);
+			if (js->gsc) {
+				/* The stream will be reinitialized later, in jabber_recv_cb_ssl() */
+				js->reinit = TRUE;
+			} else {
+				jabber_stream_init(js);
+			}
 			break;
 		case JABBER_STREAM_CONNECTED:
 			jabber_roster_request(js);