# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 990466700 0
# Node ID efc899af49123d037e222f9b63350b4dea0cfc27
# Parent  4836d30127df9b4a5bcc43050b87a2460499a9d6
[gaim-migrate @ 1882]
waah

committer: Tailor Script <tailor@pidgin.im>

diff -r 4836d30127df -r efc899af4912 src/conversation.c
--- a/src/conversation.c	Mon May 21 05:54:26 2001 +0000
+++ b/src/conversation.c	Mon May 21 17:38:20 2001 +0000
@@ -572,7 +572,7 @@
 		}
 	} else if ((event->keyval == GDK_F2) && (general_options & OPT_GEN_F2_TOGGLES)) {
 		gtk_imhtml_show_comments(GTK_IMHTML(c->text), !GTK_IMHTML(c->text)->comments);
-	} else if (event->keyval == GDK_Return) {
+	} else if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) {
 		if ((event->state & GDK_CONTROL_MASK) && (general_options & OPT_GEN_CTL_ENTER)) {
 			gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");