Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv16009/src
Modified Files:
prefs.c conversation.c
Log Message:
Make Ctrl-W optional for people who like to use it to delete words.
Rob's buying a hose clamp.
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- prefs.c 17 Mar 2002 18:29:17 -0000 1.220
+++ prefs.c 25 Apr 2002 05:57:45 -0000 1.221
@@ -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);
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -r1.349 -r1.350
--- conversation.c 20 Apr 2002 08:10:12 -0000 1.349
+++ conversation.c 25 Apr 2002 05:57:45 -0000 1.350
@@ -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;
|
