Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.c @ 28447:b357216b7b79
jabber: Fix using BOSH and legacy auth together. Closes #9990.
Thanks to Perel for testing.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 25 Aug 2009 16:38:18 +0000 |
| parents | c585572e80dd |
| children | 336d03cdced6 5f97830906bc fba8dd643796 196e4c5b2043 |
comparison
equal
deleted
inserted
replaced
| 28446:0b3142f3edb4 | 28447:b357216b7b79 |
|---|---|
| 1603 } | 1603 } |
| 1604 | 1604 |
| 1605 jabber_auth_start_old(js); | 1605 jabber_auth_start_old(js); |
| 1606 } | 1606 } |
| 1607 break; | 1607 break; |
| 1608 case JABBER_STREAM_REINITIALIZING: | 1608 case JABBER_STREAM_POST_AUTH: |
| 1609 purple_connection_update_progress(js->gc, _("Re-initializing Stream"), | 1609 purple_connection_update_progress(js->gc, _("Re-initializing Stream"), |
| 1610 (js->gsc ? 8 : 4), JABBER_CONNECT_STEPS); | 1610 (js->gsc ? 8 : 4), JABBER_CONNECT_STEPS); |
| 1611 | |
| 1612 /* The stream will be reinitialized later, in jabber_recv_cb_ssl() */ | |
| 1613 js->reinit = TRUE; | |
| 1614 | 1611 |
| 1615 break; | 1612 break; |
| 1616 case JABBER_STREAM_CONNECTED: | 1613 case JABBER_STREAM_CONNECTED: |
| 1617 /* Send initial presence */ | 1614 /* Send initial presence */ |
| 1618 jabber_presence_send(js, TRUE); | 1615 jabber_presence_send(js, TRUE); |