# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1098120325 0
# Node ID 4fd312ceaa294a3e5781ca08b00265afa4afe8b9
# Parent  70a82a701aadd6e28970ae32586984dd8630e89d
[gaim-migrate @ 11149]
I neglected to commit the changes to gtkconv.c for the keybinding stuff,
so if you tried it last night, it works now.

committer: Tailor Script <tailor@pidgin.im>

diff -r 70a82a701aad -r 4fd312ceaa29 src/gtkconv.c
--- a/src/gtkconv.c	Mon Oct 18 12:52:55 2004 +0000
+++ b/src/gtkconv.c	Mon Oct 18 17:25:25 2004 +0000
@@ -1655,17 +1655,6 @@
 	/* If CTRL was held down... */
 	if (event->state & GDK_CONTROL_MASK) {
 		switch (event->keyval) {
-			case GDK_Return:
-			case GDK_KP_Enter:
-				if (gaim_prefs_get_bool(
-					"/gaim/gtk/conversations/ctrl_enter_sends"))
-				{
-					send_cb(NULL, conv);
-
-					return TRUE;
-				}
-				break;
-
 			case GDK_Up:
 				if (!conv->send_history)
 					break;
@@ -1775,17 +1764,7 @@
 	{
 		switch (event->keyval)
 		{
-			case GDK_Return:
-			case GDK_KP_Enter:
-				if (!(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
-					gaim_prefs_get_bool("/gaim/gtk/conversations/enter_sends"))
-				{
-					send_cb(NULL, conv);
-					return TRUE;
-				}
-				break;
-
-			case GDK_Tab:
+		        case GDK_Tab:
 				return tab_complete(conv);
 				break;
 
@@ -4224,6 +4203,8 @@
 
 	g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event",
 					 G_CALLBACK(entry_key_press_cb), conv);
+	g_signal_connect(G_OBJECT(gtkconv->entry), "message_send",
+			 G_CALLBACK(send_cb), conv);
 	g_signal_connect_after(G_OBJECT(gtkconv->entry), "button_press_event",
 						   G_CALLBACK(entry_stop_rclick_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkconv->entry), "size-allocate",
@@ -4368,7 +4349,8 @@
 	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
 
 	g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event",
-					 G_CALLBACK(entry_key_press_cb), conv);
+			 G_CALLBACK(entry_key_press_cb), conv);
+	g_signal_connect(G_OBJECT(gtkconv->entry), "message_send", G_CALLBACK(send_cb), conv);
 	g_signal_connect_after(G_OBJECT(gtkconv->entry), "button_press_event",
 						   G_CALLBACK(entry_stop_rclick_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkconv->entry), "size-allocate",