From e6c967b930960a393eb3ba1dea6cd9aaf6cceec6 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 14 Jul 2007 10:29:27 +0000 Subject: [PATCH] 2007-07-14 [colin] 2.10.0cvs22 * src/toolbar.c Fix button show/hide issues --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/toolbar.c | 13 +++++++++---- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e598aef51..d2cd9cdfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-14 [colin] 2.10.0cvs22 + + * src/toolbar.c + Fix button show/hide issues + 2007-07-14 [colin] 2.10.0cvs21 * src/toolbar.c diff --git a/PATCHSETS b/PATCHSETS index d983fc50c..b9edbd554 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2675,3 +2675,4 @@ ( cvs diff -u -r 1.382.2.394 -r 1.382.2.395 src/compose.c; cvs diff -u -r 1.207.2.167 -r 1.207.2.168 src/folderview.c; cvs diff -u -r 1.274.2.195 -r 1.274.2.196 src/mainwindow.c; cvs diff -u -r 1.94.2.137 -r 1.94.2.138 src/messageview.c; cvs diff -u -r 1.395.2.310 -r 1.395.2.311 src/summaryview.c; cvs diff -u -r 1.43.2.67 -r 1.43.2.68 src/toolbar.c; cvs diff -u -r 1.19.2.18 -r 1.19.2.19 src/toolbar.h; ) > 2.10.0cvs19.patchset ( cvs diff -u -r 1.43.2.68 -r 1.43.2.69 src/toolbar.c; ) > 2.10.0cvs20.patchset ( cvs diff -u -r 1.43.2.69 -r 1.43.2.70 src/toolbar.c; ) > 2.10.0cvs21.patchset +( cvs diff -u -r 1.43.2.70 -r 1.43.2.71 src/toolbar.c; ) > 2.10.0cvs22.patchset diff --git a/configure.ac b/configure.ac index 5404a5cf8..a560edfb9 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=21 +EXTRA_VERSION=22 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/toolbar.c b/src/toolbar.c index fcd6c903e..bc435a867 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -778,12 +778,14 @@ static void activate_compose_button (Toolbar *toolbar, { if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn)) return; - gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn : toolbar->compose_news_btn); - gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn + gtk_widget_show_now(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn : toolbar->compose_mail_btn); - toolbar->compose_btn_type = type; + toolbar->compose_btn_type = type; + gtk_widget_queue_resize(toolbar->toolbar); + gtk_widget_show_now(toolbar->toolbar); + GTK_EVENTS_FLUSH(); } void toolbar_set_compose_button(Toolbar *toolbar, @@ -804,9 +806,12 @@ static void activate_learn_button (Toolbar *toolbar, gtk_widget_hide(type == LEARN_SPAM ? toolbar->learn_ham_btn : toolbar->learn_spam_btn); - gtk_widget_show(type == LEARN_SPAM ? toolbar->learn_spam_btn + gtk_widget_show_now(type == LEARN_SPAM ? toolbar->learn_spam_btn : toolbar->learn_ham_btn); toolbar->learn_btn_type = type; + gtk_widget_queue_resize(toolbar->toolbar); + gtk_widget_show_now(toolbar->toolbar); + GTK_EVENTS_FLUSH(); } void toolbar_set_learn_button(Toolbar *toolbar, -- 2.25.1