comparison: src/protocols/jabber/jabber.c
src/protocols/jabber/jabber.c
- changeset 8016
- d75a4e86f7c3
- parent 8013
- 03f5b77cdaf0
- child 8043
- 86a087e9624c
equal
deleted
inserted
replaced
| 8015:52c74f82aff3 | 8016:d75a4e86f7c3 |
|---|---|
| 686 _("Register"), G_CALLBACK(jabber_register_cb), | 686 _("Register"), G_CALLBACK(jabber_register_cb), |
| 687 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), js); | 687 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), js); |
| 688 } | 688 } |
| 689 } | 689 } |
| 690 | 690 |
| 691 static void jabber_register_start(JabberStream *js) | 691 void jabber_register_start(JabberStream *js) |
| 692 { | 692 { |
| 693 JabberIq *iq; | 693 JabberIq *iq; |
| 694 | 694 |
| 695 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:register"); | 695 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:register"); |
| 696 jabber_iq_send(iq); | 696 jabber_iq_send(iq); |
| 810 jabber_parser_setup(js); | 810 jabber_parser_setup(js); |
| 811 break; | 811 break; |
| 812 case JABBER_STREAM_AUTHENTICATING: | 812 case JABBER_STREAM_AUTHENTICATING: |
| 813 gaim_connection_update_progress(js->gc, _("Authenticating"), | 813 gaim_connection_update_progress(js->gc, _("Authenticating"), |
| 814 js->gsc ? 6 : 3, JABBER_CONNECT_STEPS); | 814 js->gsc ? 6 : 3, JABBER_CONNECT_STEPS); |
| 815 if(js->registration) | 815 if(js->protocol_version == JABBER_PROTO_0_9) { |
| 816 jabber_register_start(js); | 816 if(js->registration) |
| 817 else if(js->protocol_version == JABBER_PROTO_0_9) | 817 jabber_register_start(js); |
| 818 jabber_auth_start_old(js); | 818 else |
| 819 jabber_auth_start_old(js); | |
| 820 } | |
| 819 break; | 821 break; |
| 820 case JABBER_STREAM_REINITIALIZING: | 822 case JABBER_STREAM_REINITIALIZING: |
| 821 gaim_connection_update_progress(js->gc, _("Re-initializing Stream"), | 823 gaim_connection_update_progress(js->gc, _("Re-initializing Stream"), |
| 822 6, JABBER_CONNECT_STEPS); | 824 6, JABBER_CONNECT_STEPS); |
| 823 jabber_stream_init(js); | 825 jabber_stream_init(js); |
