Mercurial > pidgin
changeset 30172:48f41640adee
merge of '6df484b58e54743f46465726f124c339a884768f'
and 'a5baf7ca8907c15748c0a707d36aa836518b73ae'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 09 Jun 2010 17:36:49 +0000 |
| parents | aaec35719201 (current diff) 96d3f44d006d (diff) |
| children | 2a51b2c643d2 |
| files | ChangeLog |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 09 16:58:41 2010 +0000 +++ b/ChangeLog Wed Jun 09 17:36:49 2010 +0000 @@ -1,6 +1,9 @@ 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. + Finch: * Rebindable suggest-next-page and suggest-prev-page actions for textboxes (GntEntry) to scroll through list of suggestions.
--- a/pidgin/gtkimhtmltoolbar.c Wed Jun 09 16:58:41 2010 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Wed Jun 09 17:36:49 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) @@ -1243,8 +1244,6 @@ {PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")}, {"", NULL, NULL, NULL}, {PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")}, - /*{PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION, send_attention_cb, - g_object_get_data(G_OBJECT(toolbar->imhtml), "attention"), _("Send Attention")},*/ {NULL, NULL, NULL, NULL} }; int iter;