comparison src/conversation.c @ 2681:37d80035e77f

[gaim-migrate @ 2694] don't ask. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Tue, 06 Nov 2001 23:58:24 +0000
parents b0c5770156e1
children 092c5a1ddf72
comparison
equal deleted inserted replaced
2680:ab2ca2770d2e 2681:37d80035e77f
536 return FALSE; 536 return FALSE;
537 } 537 }
538 538
539 void add_callback(GtkWidget *widget, struct conversation *c) 539 void add_callback(GtkWidget *widget, struct conversation *c)
540 { 540 {
541 if (c->gc && find_buddy(c->gc, c->name) != NULL) { 541 struct buddy *b = find_buddy(c->gc, c->name);
542 if (b) {
543 struct group *g = find_group_by_buddy(c->gc, c->name);
542 debug_printf(_("Removing '%s' from buddylist.\n"), c->name); 544 debug_printf(_("Removing '%s' from buddylist.\n"), c->name);
543 serv_remove_buddy(c->gc, c->name); 545 serv_remove_buddy(c->gc, c->name, g->name);
544 remove_buddy(c->gc, find_group_by_buddy(c->gc, c->name), find_buddy(c->gc, c->name)); 546 remove_buddy(c->gc, g, b);
545 do_export(c->gc); 547 do_export(c->gc);
546 build_edit_tree(); 548 build_edit_tree();
547 update_convo_add_button(c); 549 update_convo_add_button(c);
548 } else { 550 } else if (c->gc)
549 if (c->gc) 551 show_add_buddy(c->gc, c->name, NULL, NULL);
550 show_add_buddy(c->gc, c->name, NULL, NULL);
551 }
552 552
553 gtk_widget_grab_focus(c->entry); 553 gtk_widget_grab_focus(c->entry);
554 } 554 }
555 555
556 556