comparison src/protocols/yahoo/yahoo.c @ 11338:17142948653e

[gaim-migrate @ 13551] Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined two oscar header files (one of them was small and dorky). committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 25 Aug 2005 02:33:44 +0000
parents 519dc2186438
children 7fab28c991f3
comparison
equal deleted inserted replaced
11337:1462b64f8fc9 11338:17142948653e
711 711
712 m = yahoo_string_decode(gc, im->msg, im->utf8); 712 m = yahoo_string_decode(gc, im->msg, im->utf8);
713 gaim_str_strip_cr(m); 713 gaim_str_strip_cr(m);
714 714
715 if (!strcmp(m, "<ding>")) { 715 if (!strcmp(m, "<ding>")) {
716 GaimConversation *c = gaim_conversation_new(GAIM_CONV_IM, 716 GaimConversation *c = gaim_conversation_new(GAIM_CONV_TYPE_IM,
717 gaim_connection_get_account(gc), im->from); 717 gaim_connection_get_account(gc), im->from);
718 gaim_conv_im_write(GAIM_CONV_IM(c), "", _("Buzz!!"), GAIM_MESSAGE_NICK|GAIM_MESSAGE_RECV, 718 gaim_conv_im_write(GAIM_CONV_IM(c), "", _("Buzz!!"), GAIM_MESSAGE_NICK|GAIM_MESSAGE_RECV,
719 im->time); 719 im->time);
720 g_free(m); 720 g_free(m);
721 g_free(im); 721 g_free(im);
1686 gaim_blist_remove_buddy(buddy); 1686 gaim_blist_remove_buddy(buddy);
1687 1687
1688 serv_add_deny(account->gc, name); 1688 serv_add_deny(account->gc, name);
1689 1689
1690 /* The follow should really be done by the core... */ 1690 /* The follow should really be done by the core... */
1691 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, name, account); 1691 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, account);
1692 1692
1693 if (conv != NULL) 1693 if (conv != NULL)
1694 gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE); 1694 gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE);
1695 1695
1696 g_free(name); 1696 g_free(name);