comparison: libpurple/protocols/jabber/bosh.c
libpurple/protocols/jabber/bosh.c
- changeset 38433
- 361c801c4536
- parent 38358
- 30ba44276e74
- child 38929
- 159404505264
equal
deleted
inserted
replaced
| 38431:71898cf4d20f | 38433:361c801c4536 |
|---|---|
| 148 | 148 |
| 149 purple_http_connection_set_destroy(conn->payload_reqs); | 149 purple_http_connection_set_destroy(conn->payload_reqs); |
| 150 conn->payload_reqs = NULL; | 150 conn->payload_reqs = NULL; |
| 151 | 151 |
| 152 if (conn->send_timer) | 152 if (conn->send_timer) |
| 153 purple_timeout_remove(conn->send_timer); | 153 g_source_remove(conn->send_timer); |
| 154 | 154 |
| 155 purple_http_conn_cancel(conn->sc_req); | 155 purple_http_conn_cancel(conn->sc_req); |
| 156 conn->sc_req = NULL; | 156 conn->sc_req = NULL; |
| 157 | 157 |
| 158 purple_http_keepalive_pool_unref(conn->kapool); | 158 purple_http_keepalive_pool_unref(conn->kapool); |
| 268 GString *data; | 268 GString *data; |
| 269 | 269 |
| 270 g_return_if_fail(conn != NULL); | 270 g_return_if_fail(conn != NULL); |
| 271 | 271 |
| 272 if (conn->send_timer != 0) { | 272 if (conn->send_timer != 0) { |
| 273 purple_timeout_remove(conn->send_timer); | 273 g_source_remove(conn->send_timer); |
| 274 conn->send_timer = 0; | 274 conn->send_timer = 0; |
| 275 } | 275 } |
| 276 | 276 |
| 277 if (conn->sid == NULL) | 277 if (conn->sid == NULL) |
| 278 return; | 278 return; |
| 338 | 338 |
| 339 if (data) | 339 if (data) |
| 340 g_string_append(conn->send_buff, data); | 340 g_string_append(conn->send_buff, data); |
| 341 | 341 |
| 342 if (conn->send_timer == 0) { | 342 if (conn->send_timer == 0) { |
| 343 conn->send_timer = purple_timeout_add( | 343 conn->send_timer = g_timeout_add( |
| 344 JABBER_BOSH_SEND_DELAY, | 344 JABBER_BOSH_SEND_DELAY, |
| 345 jabber_bosh_connection_send_delayed, conn); | 345 jabber_bosh_connection_send_delayed, conn); |
| 346 } | 346 } |
| 347 } | 347 } |
| 348 | 348 |
