diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2010-06-07 19:41:55 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2010-06-07 19:41:55 +0000 |
| commit | 27ad2f56a9cc95dacf7ed90841a1a8c43cc12e0c (patch) | |
| tree | 13f19bd52b3d2604d3b1d36eeaf938bb9f9ea81d | |
| parent | 7785bc03ed1c4d181d58a9a7b2799d480cacb888 (diff) | |
| download | pidgin-27ad2f56a9cc95dacf7ed90841a1a8c43cc12e0c.tar.gz | |
pidgin: Re-set focus after clicking on the attention button.
Closes #12124
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/si.c | 2 | ||||
| -rw-r--r-- | pidgin/gtkimhtmltoolbar.c | 1 |
3 files changed, 4 insertions, 1 deletions
@@ -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 --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c index 6e400a171e..33c7e2bfe4 100644 --- a/libpurple/protocols/jabber/si.c +++ b/libpurple/protocols/jabber/si.c @@ -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 --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c index 099509368f..4e06dc6213 100644 --- a/pidgin/gtkimhtmltoolbar.c +++ b/pidgin/gtkimhtmltoolbar.c @@ -911,6 +911,7 @@ static void send_attention_cb(GtkWidget *attention, GtkIMHtmlToolbar *toolbar) 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) |