Mercurial > pidgin
changeset 17808:4d53be63a558
merge of '5161434de87f4642ea96466bde679769f874d68b'
and 'f53a35f65f0dcb7810884f075a124e0cc1852d98'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 27 May 2007 02:11:53 +0000 |
| parents | c8891ebd48db (diff) f8e3b38f8e12 (current diff) |
| children | be7e6375ce7e |
| files | |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 26 23:57:42 2007 +0000 +++ b/ChangeLog Sun May 27 02:11:53 2007 +0000 @@ -1,5 +1,10 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.0.2 (??/??/????): + + Finch: + * Auto account reconnecting + version 2.0.1 (05/24/2007): * Buddy list update speedups when buddy icons are not being displayed. (Scott Wolchok)
--- a/pidgin/gtkimhtmltoolbar.c Sat May 26 23:57:42 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Sun May 27 02:11:53 2007 +0000 @@ -71,7 +71,9 @@ do_small(GtkWidget *smalltb, GtkIMHtmlToolbar *toolbar) { g_return_if_fail(toolbar != NULL); - gtk_imhtml_font_shrink(GTK_IMHTML(toolbar->imhtml)); + /* Only shrink the font on activation, not deactivation as well */ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(smalltb))) + gtk_imhtml_font_shrink(GTK_IMHTML(toolbar->imhtml)); gtk_widget_grab_focus(toolbar->imhtml); } @@ -79,7 +81,9 @@ do_big(GtkWidget *large, GtkIMHtmlToolbar *toolbar) { g_return_if_fail(toolbar); - gtk_imhtml_font_grow(GTK_IMHTML(toolbar->imhtml)); + /* Only grow the font on activation, not deactivation as well */ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(large))) + gtk_imhtml_font_grow(GTK_IMHTML(toolbar->imhtml)); gtk_widget_grab_focus(toolbar->imhtml); }