Mercurial > pidgin

diff src/conversation.c @ 363:1c4ce1da3946

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 373] whoops :) thanks GrsdLtning committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 08 Jun 2000 06:07:38 +0000
parents fd3cc0a28d5d
children 1d29321843b0
line wrap: on
line diff
--- 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");