# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 960444458 0
# Node ID 1c4ce1da39463e06d964b3181150bebe708f9515
# Parent  596682d9a58e677285346d8ae44a968e1ab3f22c
[gaim-migrate @ 373]
whoops :) thanks GrsdLtning

committer: Tailor Script <tailor@pidgin.im>

diff -r 596682d9a58e -r 1c4ce1da3946 src/buddy_chat.c
--- a/src/buddy_chat.c	Thu Jun 08 02:05:42 2000 +0000
+++ b/src/buddy_chat.c	Thu Jun 08 06:07:38 2000 +0000
@@ -351,7 +351,8 @@
 {
 	int pos;
 	if (event->keyval == GDK_Return) {
-		if (!(event->state & GDK_SHIFT_MASK)) {
+		if (!(event->state & GDK_SHIFT_MASK)
+				&& (general_options & OPT_GEN_ENTER_SENDS)) {
 			gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 		} else {
diff -r 596682d9a58e -r 1c4ce1da3946 src/conversation.c
--- a/src/conversation.c	Thu Jun 08 02:05:42 2000 +0000
+++ b/src/conversation.c	Thu Jun 08 06:07:38 2000 +0000
@@ -398,7 +398,8 @@
 {
   int pos;
   if(event->keyval==GDK_Return) {
-    if(!(event->state & GDK_SHIFT_MASK)){
+    if(!(event->state & GDK_SHIFT_MASK)
+		&& (general_options & OPT_GEN_ENTER_SENDS)) {
       gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
       //to stop the putting in of the enter character
       gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");