comparison: src/protocols/oscar/oscar.c
src/protocols/oscar/oscar.c
- changeset 7082
- d91bf4612a31
- parent 7080
- a443c1992270
- child 7083
- bdf557b0eea4
equal
deleted
inserted
replaced
| 7081:bc8f88208e3c | 7082:d91bf4612a31 |
|---|---|
| 5598 if (dim->watcher) { | 5598 if (dim->watcher) { |
| 5599 gaim_input_remove(dim->watcher); /* Otherwise, the callback will callback */ | 5599 gaim_input_remove(dim->watcher); /* Otherwise, the callback will callback */ |
| 5600 dim->watcher = 0; | 5600 dim->watcher = 0; |
| 5601 } | 5601 } |
| 5602 /* XXX is this really necessary? */ | 5602 /* XXX is this really necessary? */ |
| 5603 while (gtk_events_pending()) | 5603 gaim_core_mainloop_finish_events(); |
| 5604 gtk_main_iteration(); | |
| 5605 | 5604 |
| 5606 c = gaim_find_conversation_with_account(sn, gaim_connection_get_account(gc)); | 5605 c = gaim_find_conversation_with_account(sn, gaim_connection_get_account(gc)); |
| 5607 if (c != NULL) | 5606 if (c != NULL) |
| 5608 gaim_conversation_update_progress(c, percent); | 5607 gaim_conversation_update_progress(c, percent); |
| 5609 dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ, | 5608 dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ, |
