2004-09-06 [colin] 0.9.12cvs96.1

	* src/toolbar.c
		Sync with HEAD (fix Redirect graying out)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f1b165a4ad5f305d1c04051af0f62c790ea88789..1c15587f9208ae4fc871128c8f6e681fcdd74194 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-09-06 [colin]     0.9.12cvs96.1
+
+       * src/toolbar.c
+               Sync with HEAD (fix Redirect graying out)
+
 2004-09-06 [colin]     0.9.12cvs95.1
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 64800b04598c2cee3710517b1f3dacd815e2da5b..704baafdb314a1bf0dc2dd38d648225bcf800f9b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -161,3 +161,4 @@
 ( cvs diff -u -r 1.395.2.30 -r 1.395.2.31 src/summaryview.c; ) > 0.9.12cvs93.1.patchset
 ( cvs diff -u -r 1.60.2.9 -r 1.60.2.10 src/addressbook.c; cvs diff -u -r 1.5 -r 1.6 src/addressitem.h; cvs diff -u -r 1.13.2.1 -r 1.13.2.2 src/addritem.c; cvs diff -u -r 1.12.2.1 -r 1.12.2.2 src/addritem.h; ) > 0.9.12cvs94.1.patchset
 ( cvs diff -u -r 1.395.2.31 -r 1.395.2.32 src/summaryview.c; cvs diff -u -r 1.83.2.18 -r 1.83.2.19 src/mimeview.c; ) > 0.9.12cvs95.1.patchset
+( cvs diff -u -r 1.43.2.9 -r 1.43.2.10 src/toolbar.c; ) > 0.9.12cvs96.1.patchset

diff --git a/configure.ac b/configure.ac
index 446446f08b124116ddb877ac002cba7dee2a7989..8969c1078596261d66ca8a3ad04e16e570142b23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=95
+EXTRA_VERSION=96
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/toolbar.c b/src/toolbar.c
index 85269b3208e1973cbcab021b442901264d637b13..705d8ebb08710744db02daacac72a7985af4b3a5 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1684,7 +1684,7 @@ void toolbar_main_set_sensitive(gpointer data)
                SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->fwd_combo),
                        M_HAVE_ACCOUNT|M_TARGET_EXIST); 
        if (toolbar->fwd_combo) {
-               GtkWidget *submenu = gtk_item_factory_get_widget(toolbar->fwd_combo->factory, _("/Redirect"));
+               GtkWidget *submenu = gtk_item_factory_get_widget(toolbar->fwd_combo->factory, "/Redirect");
                SET_WIDGET_COND(submenu, M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST); 
        }