[Gaim-commits] CVS: gaim/src conversation.c,1.297,1.298

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20666

Modified Files:
	conversation.c 
Log Message:
more convo hotkey fixes


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -d -r1.297 -r1.298
--- conversation.c	2001/11/18 05:37:35	1.297
+++ conversation.c	2001/11/18 08:00:08	1.298
@@ -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;