# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1074146991 0
# Node ID 6048a3bbc2a394301c997e358e0ef83b9364dfbb
# Parent  24159041e8f488dd0f690a127173cce7adc505f7
[gaim-migrate @ 8810]
Patch from Nathan Fredrickson to fix the stuff that I broke in his last patch

committer: Tailor Script <tailor@pidgin.im>

diff -r 24159041e8f4 -r 6048a3bbc2a3 src/gtkconv.c
--- a/src/gtkconv.c	Thu Jan 15 05:41:54 2004 +0000
+++ b/src/gtkconv.c	Thu Jan 15 06:09:51 2004 +0000
@@ -1531,7 +1531,9 @@
 	GaimGtkConversation *gtkconv = data;
 
 	if (!(event->state & GDK_CONTROL_MASK)) {
-		gtk_widget_grab_focus(gtkconv->entry);
+		if (event->type == GDK_KEY_RELEASE)
+			gtk_widget_grab_focus(gtkconv->entry);
+
 		gtk_widget_event(gtkconv->entry, (GdkEvent *)event);
 
 		return TRUE;
@@ -3596,6 +3598,8 @@
 						   G_CALLBACK(entry_stop_rclick_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_press_event",
 						   G_CALLBACK(refocus_entry_cb), gtkconv);
+	g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event",
+						   G_CALLBACK(refocus_entry_cb), gtkconv);
 
 	gaim_setup_imhtml(gtkconv->imhtml);
 
@@ -3782,6 +3786,8 @@
 						   G_CALLBACK(entry_stop_rclick_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_press_event",
 						   G_CALLBACK(refocus_entry_cb), gtkconv);
+	g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event",
+						   G_CALLBACK(refocus_entry_cb), gtkconv);
 
 	gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),
 			gaim_prefs_get_bool("/gaim/gtk/conversations/show_timestamps"));