Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv1702
Modified Files:
conversation.c dialogs.c gaim.h prefs.c
Log Message:
I like beer.
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- conversation.c 2001/11/18 04:19:49 1.296
+++ conversation.c 2001/11/18 05:37:35 1.297
@@ -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);
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- dialogs.c 2001/11/18 04:19:49 1.284
+++ dialogs.c 2001/11/18 05:37:35 1.285
@@ -101,7 +101,6 @@
GtkWidget *label;
GtkWidget *ok;
GtkWidget *cancel;
- GtkWidget *checkbox;
char name[1024];
struct gaim_connection *gc;
};
@@ -502,12 +501,6 @@
gtk_label_set_justify(GTK_LABEL(b->label), GTK_JUSTIFY_LEFT);
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);
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- gaim.h 2001/11/18 04:19:49 1.293
+++ gaim.h 2001/11/18 05:37:35 1.294
@@ -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
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- prefs.c 2001/11/18 04:19:49 1.198
+++ prefs.c 2001/11/18 05:37:35 1.199
@@ -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);
|
