# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1057328702 0
# Node ID 66a8e4938e177b89cd2660663bec1c35d7adeda2
# Parent  9ab75d4fafac6536e9931bc318e31271f29eb111
[gaim-migrate @ 6463]
this _might_ fix ctl+m on windows (and elsewhere)

committer: Tailor Script <tailor@pidgin.im>

diff -r 9ab75d4fafac -r 66a8e4938e17 src/gtkconv.c
--- a/src/gtkconv.c	Fri Jul 04 06:43:21 2003 +0000
+++ b/src/gtkconv.c	Fri Jul 04 14:25:02 2003 +0000
@@ -1167,7 +1167,8 @@
 
 		return FALSE;
 	}
-	else if ((event->state & GDK_CONTROL_MASK) && (event->keyval == 'm')) {
+	else if ((event->state & GDK_CONTROL_MASK) && (event->keyval == 'm' ||
+				event->keyval == 'M')) {
 		g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
 		gtk_text_buffer_insert_at_cursor(gtkconv->entry_buffer, "\n", 1);
 	}
@@ -1248,10 +1249,10 @@
 					g_signal_stop_emission_by_name(G_OBJECT(entry),
 												 "key_press_event");
 					break;
-					
+
 				case '-':
 					do_small(NULL, gtkconv);
-					
+
 					g_signal_stop_emission_by_name(G_OBJECT(entry),
 												 "key_press_event");
 					break;