From 81f15a15ba6c48d5aa626dac0cec241ac0ffe43f Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 14 Jul 2007 17:27:25 +0000 Subject: [PATCH] 2007-07-14 [colin] 2.10.0cvs26 * src/toolbar.c Fix the button workaround fix. (Use the correct variable) --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/toolbar.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffcd15591..f6487bf5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-14 [colin] 2.10.0cvs26 + + * src/toolbar.c + Fix the button workaround fix. + (Use the correct variable) + 2007-07-14 [colin] 2.10.0cvs25 * src/mainwindow.c diff --git a/PATCHSETS b/PATCHSETS index b23b7d6c3..a2e471819 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2679,3 +2679,4 @@ ( cvs diff -u -r 1.43.2.71 -r 1.43.2.72 src/toolbar.c; ) > 2.10.0cvs23.patchset ( cvs diff -u -r 1.155.2.68 -r 1.155.2.69 src/Makefile.am; cvs diff -u -r 1.204.2.139 -r 1.204.2.140 src/prefs_common.c; cvs diff -u -r 1.25.2.40 -r 1.25.2.41 src/stock_pixmap.c; cvs diff -u -r 1.18.2.29 -r 1.18.2.30 src/stock_pixmap.h; cvs diff -u -r 1.43.2.72 -r 1.43.2.73 src/toolbar.c; diff -u /dev/null src/pixmaps/go_folders.xpm; ) > 2.10.0cvs24.patchset ( cvs diff -u -r 1.274.2.196 -r 1.274.2.197 src/mainwindow.c; cvs diff -u -r 1.43.2.73 -r 1.43.2.74 src/toolbar.c; ) > 2.10.0cvs25.patchset +( cvs diff -u -r 1.43.2.74 -r 1.43.2.75 src/toolbar.c; ) > 2.10.0cvs26.patchset diff --git a/configure.ac b/configure.ac index 836312c98..ebd82d007 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=25 +EXTRA_VERSION=26 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/toolbar.c b/src/toolbar.c index 49f10a15f..d5d62ed63 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -2030,7 +2030,7 @@ void toolbar_update(ToolbarType type, gpointer data) GtkWidget *child = gtk_bin_get_child( \ GTK_BIN(widget)); \ if (GTK_IS_BUTTON(child)) \ - GTK_BUTTON(child)->in_button = in_btn2; \ + GTK_BUTTON(child)->in_button = in_btn1; \ } \ } -- 2.25.1