# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1006070408 0
# Node ID 497868102c90f2d061eff88fa0514cae9d3e0264
# Parent  51fc8e5acd7ac80ae2c7910564de56a0fb49ad60
[gaim-migrate @ 2761]
more convo hotkey fixes

committer: Tailor Script <tailor@pidgin.im>

diff -r 51fc8e5acd7a -r 497868102c90 src/conversation.c
--- a/src/conversation.c	Sun Nov 18 07:41:01 2001 +0000
+++ b/src/conversation.c	Sun Nov 18 08:00:08 2001 +0000
@@ -599,9 +599,11 @@
 		if ((event->state & GDK_CONTROL_MASK) && (convo_options & OPT_CONVO_CTL_ENTER)) {
 			gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+			return TRUE;
 		} else if (!(event->state & GDK_SHIFT_MASK) && (convo_options & OPT_CONVO_ENTER_SENDS)) {
 			gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+			return TRUE;
 		} else {
 			int oldpos;
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
@@ -609,6 +611,7 @@
 			gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos);
 			if (oldpos == pos)
 				gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1);
+			return TRUE;
 		}
 	} else if ((event->state & GDK_CONTROL_MASK) && (event->keyval == 'm')) {
 		int oldpos;