# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1006061855 0
# Node ID 0c8de85fee622d3c38cb84cadfb2482e5fa332bf
# Parent  62df9fbd201a8e9b9ebb9eaa49115e1980e319f7
[gaim-migrate @ 2758]
I like beer.

committer: Tailor Script <tailor@pidgin.im>

diff -r 62df9fbd201a -r 0c8de85fee62 src/conversation.c
--- a/src/conversation.c	Sun Nov 18 04:20:05 2001 +0000
+++ b/src/conversation.c	Sun Nov 18 05:37:35 2001 +0000
@@ -540,10 +540,7 @@
 {
 	struct buddy *b = find_buddy(c->gc, c->name);
 	if (b) {
-		if (im_options & OPT_IM_DONT_CONFIRM_DEL)
-			show_confirm_del(c->gc, c->name);
-		else
-			do_remove_buddy(NULL, b);
+		show_confirm_del(c->gc, c->name);
 	} else if (c->gc)
 		show_add_buddy(c->gc, c->name, NULL, NULL);
 
diff -r 62df9fbd201a -r 0c8de85fee62 src/dialogs.c
--- a/src/dialogs.c	Sun Nov 18 04:20:05 2001 +0000
+++ b/src/dialogs.c	Sun Nov 18 05:37:35 2001 +0000
@@ -101,7 +101,6 @@
 	GtkWidget *label;
 	GtkWidget *ok;
 	GtkWidget *cancel;
-	GtkWidget *checkbox;	
 	char name[1024];
 	struct gaim_connection *gc;
 };
@@ -503,12 +502,6 @@
 	gtk_box_pack_start(GTK_BOX(fbox), b->label, FALSE, FALSE, 0);
 	gtk_widget_show(b->label);
 
-	b->checkbox = gtk_check_button_new_with_label(_("Do not ask me this question again"));
-	gtk_signal_connect(GTK_OBJECT(b->checkbox), "clicked",
-			   GTK_SIGNAL_FUNC(toggle_confirm_del_cb), (int *)OPT_IM_DONT_CONFIRM_DEL);
-	gtk_box_pack_start(GTK_BOX(fbox), b->checkbox, FALSE, FALSE, 0);
-	gtk_widget_show(b->checkbox);
-
 	hbox = gtk_hbox_new(FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 0);
diff -r 62df9fbd201a -r 0c8de85fee62 src/gaim.h
--- a/src/gaim.h	Sun Nov 18 04:20:05 2001 +0000
+++ b/src/gaim.h	Sun Nov 18 05:37:35 2001 +0000
@@ -242,7 +242,6 @@
 #define OPT_IM_SIDE_TAB			0x00000020
 #define OPT_IM_BR_TAB			0x00000040
 #define OPT_IM_HIDE_ICONS		0x00000080
-#define OPT_IM_DONT_CONFIRM_DEL		0x00000100
 
 extern guint chat_options;
 #define OPT_CHAT_ONE_WINDOW		0x00000001
diff -r 62df9fbd201a -r 0c8de85fee62 src/prefs.c
--- a/src/prefs.c	Sun Nov 18 04:20:05 2001 +0000
+++ b/src/prefs.c	Sun Nov 18 05:37:35 2001 +0000
@@ -906,8 +906,6 @@
 			vbox2);
 	gaim_button(_("Raise windows on events"), &im_options, OPT_IM_POPUP, vbox2);
 	gaim_button(_("Show logins in window"), &im_options, OPT_IM_LOGON, vbox2);
-	gaim_button(_("Do not confirm removing of buddies"), &im_options, OPT_IM_DONT_CONFIRM_DEL, vbox2);
-
 	frame = gtk_frame_new(_("Window Sizes"));
 	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
 	gtk_widget_show(frame);