From: Sean E. <sea...@us...> - 2004-11-20 23:10:31
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16076/src Modified Files: Tag: oldstatus gtkblist.c gtkdialogs.c Log Message: and oldstatus Index: gtkblist.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v retrieving revision 1.174.2.8 retrieving revision 1.174.2.9 diff -u -d -p -r1.174.2.8 -r1.174.2.9 --- gtkblist.c 19 Oct 2004 18:37:21 -0000 1.174.2.8 +++ gtkblist.c 20 Nov 2004 23:09:55 -0000 1.174.2.9 @@ -3517,6 +3517,8 @@ void gaim_gtk_blist_update_toolbar() { static void gaim_gtk_blist_remove(GaimBuddyList *list, GaimBlistNode *node) { + gaim_request_close_with_handle(node); + gaim_gtk_blist_hide_node(list, node); if(node->parent) Index: gtkdialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.c,v retrieving revision 1.11.2.12 retrieving revision 1.11.2.13 diff -u -d -p -r1.11.2.12 -r1.11.2.13 --- gtkdialogs.c 10 Nov 2004 17:08:01 -0000 1.11.2.12 +++ gtkdialogs.c 20 Nov 2004 23:09:55 -0000 1.11.2.13 @@ -759,7 +759,7 @@ gaim_gtkdialogs_remove_contact(GaimConta gchar *text = g_strdup_printf(_("You are about to remove the contact containing %s and %d other buddies from your buddy list. Do you want to continue?"), buddy->name, contact->totalsize - 1); - gaim_request_action(NULL, NULL, _("Remove Contact"), text, + gaim_request_action(contact, NULL, _("Remove Contact"), text, 0, contact, 2, _("Remove Contact"), G_CALLBACK(gaim_gtkdialogs_remove_contact_cb), _("Cancel"), NULL); @@ -820,7 +820,7 @@ gaim_gtkdialogs_remove_group(GaimGroup * text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"), group->name); - gaim_request_action(NULL, NULL, _("Remove Group"), text, 0, group, 2, + gaim_request_action(group, NULL, _("Remove Group"), text, 0, group, 2, _("Remove Group"), G_CALLBACK(gaim_gtkdialogs_remove_group_cb), _("Cancel"), NULL); @@ -862,7 +862,7 @@ gaim_gtkdialogs_remove_buddy(GaimBuddy * text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"), buddy->name); - gaim_request_action(NULL, NULL, _("Remove Buddy"), text, + gaim_request_action(buddy, NULL, _("Remove Buddy"), text, 0, buddy, 2, _("Remove Buddy"), G_CALLBACK(gaim_gtkdialogs_remove_buddy_cb), _("Cancel"), NULL); @@ -901,7 +901,7 @@ gaim_gtkdialogs_remove_chat(GaimChat *ch g_return_if_fail(chat != NULL); - gaim_request_action(NULL, NULL, _("Remove Chat"), text, 0, chat, 2, + gaim_request_action(chat, NULL, _("Remove Chat"), text, 0, chat, 2, _("Remove Chat"), G_CALLBACK(gaim_gtkdialogs_remove_chat_cb), _("Cancel"), NULL); |