comparison: libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.c
- changeset 41812
- c3cd920261b6
- parent 41799
- d567f89d6a9b
- child 41814
- f8940ebd4eee
equal
deleted
inserted
replaced
| 41811:f4ac61968453 | 41812:c3cd920261b6 |
|---|---|
| 1291 if (type != JABBER_IQ_RESULT) | 1291 if (type != JABBER_IQ_RESULT) |
| 1292 return; | 1292 return; |
| 1293 | 1293 |
| 1294 if(js->registration) { | 1294 if(js->registration) { |
| 1295 /* get rid of the login thingy */ | 1295 /* get rid of the login thingy */ |
| 1296 purple_connection_set_state(js->gc, PURPLE_CONNECTION_CONNECTED); | 1296 purple_connection_set_state(js->gc, PURPLE_CONNECTION_STATE_CONNECTED); |
| 1297 } | 1297 } |
| 1298 | 1298 |
| 1299 if(purple_xmlnode_get_child(query, "registered")) { | 1299 if(purple_xmlnode_get_child(query, "registered")) { |
| 1300 registered = TRUE; | 1300 registered = TRUE; |
| 1301 | 1301 |
| 1496 PurpleAccountUnregistrationCb cb, gpointer user_data) | 1496 PurpleAccountUnregistrationCb cb, gpointer user_data) |
| 1497 { | 1497 { |
| 1498 PurpleConnection *gc = purple_account_get_connection(account); | 1498 PurpleConnection *gc = purple_account_get_connection(account); |
| 1499 JabberStream *js; | 1499 JabberStream *js; |
| 1500 | 1500 |
| 1501 if (purple_connection_get_state(gc) != PURPLE_CONNECTION_CONNECTED) { | 1501 if (purple_connection_get_state(gc) != PURPLE_CONNECTION_STATE_CONNECTED) { |
| 1502 #warning fix registration and unregistration | 1502 #warning fix registration and unregistration |
| 1503 #if 0 | 1503 #if 0 |
| 1504 if (purple_connection_get_state(gc) != PURPLE_CONNECTION_CONNECTING) { | 1504 if (purple_connection_get_state(gc) != PURPLE_CONNECTION_CONNECTING) { |
| 1505 jabber_login(PURPLE_PROTOCOL(protocol_server), account); | 1505 jabber_login(PURPLE_PROTOCOL(protocol_server), account); |
| 1506 } | 1506 } |
| 1644 /* Send initial presence */ | 1644 /* Send initial presence */ |
| 1645 jabber_presence_send(js, TRUE); | 1645 jabber_presence_send(js, TRUE); |
| 1646 /* Start up the inactivity timer */ | 1646 /* Start up the inactivity timer */ |
| 1647 jabber_stream_restart_inactivity_timer(js); | 1647 jabber_stream_restart_inactivity_timer(js); |
| 1648 | 1648 |
| 1649 purple_connection_set_state(js->gc, PURPLE_CONNECTION_CONNECTED); | 1649 purple_connection_set_state(js->gc, PURPLE_CONNECTION_STATE_CONNECTED); |
| 1650 } | 1650 } |
| 1651 } | 1651 } |
| 1652 | 1652 |
| 1653 char *jabber_get_next_id(JabberStream *js) | 1653 char *jabber_get_next_id(JabberStream *js) |
| 1654 { | 1654 { |
