pidgin: 3787c491: pidgin: Re-set focus after clicking on t...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 3787c491815bdc62570cef158440584a850cee8d
Ancestor: 66c343e57ba5828a78d88d159a594e3c4131e50e
Author: malu at pidgin.im
Date: 2010-06-07T19:41:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3787c491815bdc62570cef158440584a850cee8d

Modified files:
        ChangeLog libpurple/protocols/jabber/si.c
        pidgin/gtkimhtmltoolbar.c

ChangeLog: 

pidgin: Re-set focus after clicking on the attention button.
Closes #12124

-------------- next part --------------
============================================================
--- ChangeLog	04aa577f39f4759a7677e6ecc0db9547d5c2d5a3
+++ ChangeLog	5dfe2d1234a64fc6f348ab1911c654d326c4dd8b
@@ -1,6 +1,8 @@ version 2.7.2 (??/??/????):
 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:
============================================================
--- libpurple/protocols/jabber/si.c	c3f9ed512b83933661995978936a65f03b685f24
+++ libpurple/protocols/jabber/si.c	89bd22bcd01c3ce92931e65c3995f7d90c6c89d8
@@ -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;
============================================================
--- pidgin/gtkimhtmltoolbar.c	bc5fee66c34d6b952679849fbefcffe34e842ca9
+++ pidgin/gtkimhtmltoolbar.c	3fb984958bcede3195b7266fb79efa38eb8e021d
@@ -911,6 +911,7 @@ static void send_attention_cb(GtkWidget 
 
 	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)