# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1019714265 0
# Node ID 255155a1b19025a0f040ad968f626c6e1054ffd7
# Parent  dab4da8ca29a4ff5ec36134e80216e399fd5c80c
[gaim-migrate @ 3184]
Make Ctrl-W optional for people who like to use it to delete words.

Rob's buying a hose clamp.

committer: Tailor Script <tailor@pidgin.im>

diff -r dab4da8ca29a -r 255155a1b190 src/conversation.c
--- a/src/conversation.c	Thu Apr 25 05:48:20 2002 +0000
+++ b/src/conversation.c	Thu Apr 25 05:57:45 2002 +0000
@@ -1016,7 +1016,7 @@
 			gtk_imhtml_clear(GTK_IMHTML(c->text));
 			g_string_free(c->history, TRUE);
 			c->history = g_string_new("");
-		} else if (event->keyval == 'w') {
+		} else if ((event->keyval == 'w') && (convo_options & OPT_CONVO_CTL_W_CLOSES)) {
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 			close_callback(c->close, c);
 			c = NULL;
diff -r dab4da8ca29a -r 255155a1b190 src/prefs.c
--- a/src/prefs.c	Thu Apr 25 05:48:20 2002 +0000
+++ b/src/prefs.c	Thu Apr 25 05:57:45 2002 +0000
@@ -681,6 +681,7 @@
 	gaim_button(_("Enter sends message"), &convo_options, OPT_CONVO_ENTER_SENDS, vbox);
 	gaim_button(_("Control-Enter sends message"), &convo_options, OPT_CONVO_CTL_ENTER, vbox);
 	gaim_button(_("Escape closes window"), &convo_options, OPT_CONVO_ESC_CAN_CLOSE, vbox);
+	gaim_button(_("Control-W closes window"), &convo_options, OPT_CONVO_CTL_W_CLOSES, vbox);
 
 	vbox = gtk_vbox_new(TRUE, 5);
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);