Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/jabber.c @ 17628:d53aa2308727

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug that caused incorrect stream negotiation, which ejabberd and openfire tolerate, but gtalk does not.
author Andreas Monitzer <pidgin@monitzer.com>
date Wed, 11 Jul 2007 00:17:11 +0000
parents a8420fd18545
children 5c1ed6296b56
comparison
equal deleted inserted replaced
17625:7cffeebc301c 17628:d53aa2308727
1168 jabber_stream_init(js); 1168 jabber_stream_init(js);
1169 break; 1169 break;
1170 case JABBER_STREAM_INITIALIZING_ENCRYPTION: 1170 case JABBER_STREAM_INITIALIZING_ENCRYPTION:
1171 purple_connection_update_progress(js->gc, _("Initializing SSL/TLS"), 1171 purple_connection_update_progress(js->gc, _("Initializing SSL/TLS"),
1172 6, JABBER_CONNECT_STEPS); 1172 6, JABBER_CONNECT_STEPS);
1173 jabber_stream_init(js);
1174 break; 1173 break;
1175 case JABBER_STREAM_AUTHENTICATING: 1174 case JABBER_STREAM_AUTHENTICATING:
1176 purple_connection_update_progress(js->gc, _("Authenticating"), 1175 purple_connection_update_progress(js->gc, _("Authenticating"),
1177 js->gsc ? 7 : 3, JABBER_CONNECT_STEPS); 1176 js->gsc ? 7 : 3, JABBER_CONNECT_STEPS);
1178 if(js->protocol_version == JABBER_PROTO_0_9 && js->registration) { 1177 if(js->protocol_version == JABBER_PROTO_0_9 && js->registration) {