Mercurial > pidgin.yaz
comparison src/gtkdialogs.c @ 11643:eb14bbcf7249
[gaim-migrate @ 13920]
sf patch #1293063, from John Bailey
Move and rename some functions from server.c to the account API.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 12 Oct 2005 02:47:31 +0000 |
parents | 6135c29a514f |
children | a4880ada048d |
comparison
equal
deleted
inserted
replaced
11642:58bc500cf226 | 11643:eb14bbcf7249 |
---|---|
774 cnode = (GaimBlistNode *)contact; | 774 cnode = (GaimBlistNode *)contact; |
775 group = (GaimGroup*)cnode->parent; | 775 group = (GaimGroup*)cnode->parent; |
776 for (bnode = cnode->child; bnode; bnode = bnode->next) { | 776 for (bnode = cnode->child; bnode; bnode = bnode->next) { |
777 GaimBuddy *buddy = (GaimBuddy*)bnode; | 777 GaimBuddy *buddy = (GaimBuddy*)bnode; |
778 if (gaim_account_is_connected(buddy->account)) | 778 if (gaim_account_is_connected(buddy->account)) |
779 serv_remove_buddy(buddy->account->gc, buddy, group); | 779 gaim_account_remove_buddy(buddy->account, buddy, group); |
780 } | 780 } |
781 gaim_blist_remove_contact(contact); | 781 gaim_blist_remove_contact(contact); |
782 } | 782 } |
783 | 783 |
784 void | 784 void |
831 bnode = bnode->next; | 831 bnode = bnode->next; |
832 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, | 832 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, |
833 buddy->name, | 833 buddy->name, |
834 buddy->account); | 834 buddy->account); |
835 if (gaim_account_is_connected(buddy->account)) { | 835 if (gaim_account_is_connected(buddy->account)) { |
836 serv_remove_buddy(buddy->account->gc, buddy, group); | 836 gaim_account_remove_buddy(buddy->account, buddy, group); |
837 gaim_blist_remove_buddy(buddy); | 837 gaim_blist_remove_buddy(buddy); |
838 if (conv) | 838 if (conv) |
839 gaim_conversation_update(conv, | 839 gaim_conversation_update(conv, |
840 GAIM_CONV_UPDATE_REMOVE); | 840 GAIM_CONV_UPDATE_REMOVE); |
841 } | 841 } |
885 group = gaim_find_buddys_group(buddy); | 885 group = gaim_find_buddys_group(buddy); |
886 name = g_strdup(buddy->name); /* b->name is a crasher after remove_buddy */ | 886 name = g_strdup(buddy->name); /* b->name is a crasher after remove_buddy */ |
887 account = buddy->account; | 887 account = buddy->account; |
888 | 888 |
889 gaim_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name); | 889 gaim_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name); |
890 /* TODO - Should remove from blist first... then call serv_remove_buddy()? */ | 890 /* TODO - Should remove from blist first... then call gaim_account_remove_buddy()? */ |
891 serv_remove_buddy(buddy->account->gc, buddy, group); | 891 gaim_account_remove_buddy(buddy->account, buddy, group); |
892 gaim_blist_remove_buddy(buddy); | 892 gaim_blist_remove_buddy(buddy); |
893 | 893 |
894 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, account); | 894 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, account); |
895 if (conv != NULL) | 895 if (conv != NULL) |
896 gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE); | 896 gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE); |