Mercurial > pidgin
comparison src/protocols/oscar/oscar.c @ 8287:ef881489396e
[gaim-migrate @ 9011]
Another patch from Scott Lamb to change g_source_remove calls to
gaim_timeout_remove. It also implements gaim_timeout_remove.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Wed, 18 Feb 2004 07:43:21 +0000 |
parents | f24172f53650 |
children | 34e8ad866f12 |
comparison
equal
deleted
inserted
replaced
8286:89d9d004e3f3 | 8287:ef881489396e |
---|---|
788 if (od->emlpa > 0) | 788 if (od->emlpa > 0) |
789 gaim_input_remove(od->emlpa); | 789 gaim_input_remove(od->emlpa); |
790 if (od->icopa > 0) | 790 if (od->icopa > 0) |
791 gaim_input_remove(od->icopa); | 791 gaim_input_remove(od->icopa); |
792 if (od->icontimer > 0) | 792 if (od->icontimer > 0) |
793 g_source_remove(od->icontimer); | 793 gaim_timeout_remove(od->icontimer); |
794 if (od->getblisttimer) | 794 if (od->getblisttimer) |
795 g_source_remove(od->getblisttimer); | 795 gaim_timeout_remove(od->getblisttimer); |
796 aim_session_kill(od->sess); | 796 aim_session_kill(od->sess); |
797 g_free(od->sess); | 797 g_free(od->sess); |
798 od->sess = NULL; | 798 od->sess = NULL; |
799 g_free(gc->proto_data); | 799 g_free(gc->proto_data); |
800 gc->proto_data = NULL; | 800 gc->proto_data = NULL; |
1461 aim_clientready(sess, fr->conn); | 1461 aim_clientready(sess, fr->conn); |
1462 | 1462 |
1463 od->iconconnecting = FALSE; | 1463 od->iconconnecting = FALSE; |
1464 | 1464 |
1465 if (od->icontimer) | 1465 if (od->icontimer) |
1466 g_source_remove(od->icontimer); | 1466 gaim_timeout_remove(od->icontimer); |
1467 od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc); | 1467 od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc); |
1468 | 1468 |
1469 return 1; | 1469 return 1; |
1470 } | 1470 } |
1471 | 1471 |
1880 while (cur && aim_sncmp((char *)cur->data, info->sn)) | 1880 while (cur && aim_sncmp((char *)cur->data, info->sn)) |
1881 cur = cur->next; | 1881 cur = cur->next; |
1882 if (!cur) { | 1882 if (!cur) { |
1883 od->requesticon = g_slist_append(od->requesticon, g_strdup(gaim_normalize(gc->account, info->sn))); | 1883 od->requesticon = g_slist_append(od->requesticon, g_strdup(gaim_normalize(gc->account, info->sn))); |
1884 if (od->icontimer) | 1884 if (od->icontimer) |
1885 g_source_remove(od->icontimer); | 1885 gaim_timeout_remove(od->icontimer); |
1886 od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc); | 1886 od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc); |
1887 } | 1887 } |
1888 } | 1888 } |
1889 g_free(b16); | 1889 g_free(b16); |
1890 } | 1890 } |
3494 "removing %s from hash table\n", sn); | 3494 "removing %s from hash table\n", sn); |
3495 od->requesticon = g_slist_remove(od->requesticon, sn); | 3495 od->requesticon = g_slist_remove(od->requesticon, sn); |
3496 free(sn); | 3496 free(sn); |
3497 | 3497 |
3498 if (od->icontimer) | 3498 if (od->icontimer) |
3499 g_source_remove(od->icontimer); | 3499 gaim_timeout_remove(od->icontimer); |
3500 od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc); | 3500 od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc); |
3501 | 3501 |
3502 return 1; | 3502 return 1; |
3503 } | 3503 } |
3504 | 3504 |
3542 } else | 3542 } else |
3543 cur = cur->next; | 3543 cur = cur->next; |
3544 } | 3544 } |
3545 | 3545 |
3546 if (od->icontimer) | 3546 if (od->icontimer) |
3547 g_source_remove(od->icontimer); | 3547 gaim_timeout_remove(od->icontimer); |
3548 od->icontimer = gaim_timeout_add(250, gaim_icon_timerfunc, gc); | 3548 od->icontimer = gaim_timeout_add(250, gaim_icon_timerfunc, gc); |
3549 | 3549 |
3550 return 1; | 3550 return 1; |
3551 } | 3551 } |
3552 | 3552 |