# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1075269032 0
# Node ID c733bb72b0021e51cdc00dd48b629638b6c3b01d
# Parent  f347c8d25cf5add12ba2926c092ef10ceba8677c
[gaim-migrate @ 8890]
A patch from Nathan Fredrickson to focus the text entry box in conversations
when switching tabs.  This correctly fixes my hack from a few minutes ago.
Well, it's more correct, anyway.  I don't _think_ it should hurt any kind
of accessibility... convo windows will need a caret or something anyway.

Rock on.

committer: Tailor Script <tailor@pidgin.im>

diff -r f347c8d25cf5 -r c733bb72b002 src/gtkconv.c
--- a/src/gtkconv.c	Wed Jan 28 05:43:04 2004 +0000
+++ b/src/gtkconv.c	Wed Jan 28 05:50:32 2004 +0000
@@ -3678,16 +3678,6 @@
 
 		gtk_box_pack_start(GTK_BOX(hbox), gtkchat->topic_text, TRUE, TRUE, 5);
 		gtk_widget_show(gtkchat->topic_text);
-
-		/*
-		 * We probably shouldn't need this.  When switching tabs to a chat 
-		 * window focus is supposed to go to the entry box, but for some 
-		 * reason it's going to the topic entry box.
-		 */
-		g_signal_connect(G_OBJECT(gtkchat->topic_text), "key_press_event",
-							   G_CALLBACK(refocus_entry_cb), gtkconv);
-		g_signal_connect(G_OBJECT(gtkchat->topic_text), "key_release_event",
-							   G_CALLBACK(refocus_entry_cb), gtkconv);
 	}
 
 	/* Setup the horizontal pane. */
@@ -4292,6 +4282,9 @@
 		gtkconv->show_formatting_toolbar = gaim_prefs_get_bool(
 				"/gaim/gtk/conversations/show_formatting_toolbar");
 
+		g_signal_connect_swapped(G_OBJECT(pane), "focus",
+					G_CALLBACK(gtk_widget_grab_focus),
+					gtkconv->entry);
 	}
 
 	gtkconv->tabby = tabby = gtk_hbox_new(FALSE, 5);