2005-01-25 [paul] 1.0.0cvs14.1

	* configure.ac
	* src/compose.c
		sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index e66fcd79a981e68395a377d2409d188d40f86f47..2b94d052853318b4322d80ed693f01431af5ffd0 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-01-25 [paul]      1.0.0cvs14.1
+
+       * configure.ac
+       * src/compose.c
+               sync with HEAD
+
 2005-01-24 [colin]     1.0.0cvs13.1
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 786417d8307518d11db5a1b61de8c51c1e7a33c1..cf7a4cb74dedf8f7fb96eb9601f233b04fa9ff9c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -342,3 +342,4 @@
 ( cvs diff -u -r 1.47.2.12 -r 1.47.2.13 src/procheader.c; ) > 1.0.0cvs11.1.patchset
 ( cvs diff -u -r 1.654.2.375 -r 1.654.2.376 configure.ac; cvs diff -u -r 1.94.2.37 -r 1.94.2.38 src/messageview.c; cvs diff -u -r 1.79.2.5 -r 1.79.2.6 src/mh.c; cvs diff -u -r 1.36.2.20 -r 1.36.2.21 src/common/utils.c; ) > 1.0.0cvs12.1.patchset
 ( cvs diff -u -r 1.395.2.46 -r 1.395.2.47 src/summaryview.c; ) > 1.0.0cvs13.1.patchset
+( cvs diff -u -r 1.654.2.377 -r 1.654.2.378 configure.ac; cvs diff -u -r 1.382.2.86 -r 1.382.2.87 src/compose.c; ) > 1.0.0cvs14.1.patchset

diff --git a/configure.ac b/configure.ac
index 616b75a4a32aa4671dae491d66ac9cab5774fc1d..5596d849f63c06490f61e34553a581049beed15a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/compose.c b/src/compose.c
index 47c5ea8e08c8cd78d2dfa824b4c83312eada7c4d..4bbad4ec0ed58b867e9d2e8be4c1412fd6696117 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1419,7 +1419,7 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
        ifactory = gtk_item_factory_from_widget(compose->popupmenu);
        menu_set_sensitive(ifactory, "/Add...", FALSE);
        menu_set_sensitive(ifactory, "/Remove", FALSE);
-       menu_set_sensitive(ifactory, "/Property...", FALSE);
+       menu_set_sensitive(ifactory, "/Properties...", FALSE);
 
        ifactory = gtk_item_factory_from_widget(compose->menubar);
        menu_set_sensitive(ifactory, "/Message/Save", FALSE);