Mercurial > pidgin
comparison src/protocols/oscar/oscar.c @ 7082:25a616f16b6c
[gaim-migrate @ 7647]
Added more core wrappers for the glib mainloops, and replaced the last
GTK+ code in OSCAR with them.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Tue, 30 Sep 2003 22:55:22 +0000 |
parents | fc9c74cfb306 |
children | 3100a6e03644 |
comparison
equal
deleted
inserted
replaced
7081:73da9c3ad9ac | 7082:25a616f16b6c |
---|---|
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, |