# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1275939715 0
# Node ID dd6575f20790e0752a63b98b0d1687c140872f0f
# Parent  bed884491864057f35e387045667c708e4d7312b
pidgin: Re-set focus after clicking on the attention button.
Closes #12124

diff -r bed884491864 -r dd6575f20790 ChangeLog
--- a/ChangeLog	Sun Jun 06 02:17:36 2010 +0000
+++ b/ChangeLog	Mon Jun 07 19:41:55 2010 +0000
@@ -1,6 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.2 (??/??/????):
+	Pidgin:
+	* Re-focus the input area after clicking the attention toolbar button.
 
 version 2.7.1 (05/29/2010):
 	General:
diff -r bed884491864 -r dd6575f20790 libpurple/protocols/jabber/si.c
--- a/libpurple/protocols/jabber/si.c	Sun Jun 06 02:17:36 2010 +0000
+++ b/libpurple/protocols/jabber/si.c	Mon Jun 07 19:41:55 2010 +0000
@@ -40,7 +40,7 @@
 #include "si.h"
 
 #define STREAMHOST_CONNECT_TIMEOUT 15
-#define ENABLE_FT_THUMBNAILS 0
+#define ENABLE_FT_THUMBNAILS 1
 
 typedef struct _JabberSIXfer {
 	JabberStream *js;
diff -r bed884491864 -r dd6575f20790 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Sun Jun 06 02:17:36 2010 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Mon Jun 07 19:41:55 2010 +0000
@@ -911,6 +911,7 @@
 
 	toggle_button_set_active_block(GTK_TOGGLE_BUTTON(attention), FALSE, toolbar);
 	purple_prpl_send_attention(gc, who, 0);
+	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
 static void update_buttons_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, GtkIMHtmlToolbar *toolbar)