2007-11-07 [colin] 3.0.2cvs125

	* src/toolbar.c
		Re-change the string occurence of A_CLAWS_ACTIONS
		to A_SYL_ACTIONS, to prevent parse errors of the
		toolbar_*.xml files

diff --git a/ChangeLog b/ChangeLog
index d127fa098a28ec860633fd8f4775021c64a37fd2..f0d5311c2c122868cbf6b7d0dda4a562d624cccd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-07 [colin]     3.0.2cvs125
+
+       * src/toolbar.c
+               Re-change the string occurence of A_CLAWS_ACTIONS
+               to A_SYL_ACTIONS, to prevent parse errors of the
+               toolbar_*.xml files
+

 2007-11-07 [colin]     3.0.2cvs124
 
        * src/mimeview.c
 2007-11-07 [colin]     3.0.2cvs124
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 417cc3b6db1fc6be0c07b44fc52effcc101b8f56..326309afc3d798a88198f18a0d8d008666853baa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3037,3 +3037,4 @@
 ( cvs diff -u -r 1.43.2.90 -r 1.43.2.91 src/toolbar.c;  ) > 3.0.2cvs122.patchset
 ( cvs diff -u -r 1.30.2.46 -r 1.30.2.47 src/prefs_toolbar.c;  cvs diff -u -r 1.43.2.91 -r 1.43.2.92 src/toolbar.c;  cvs diff -u -r 1.19.2.25 -r 1.19.2.26 src/toolbar.h;  ) > 3.0.2cvs123.patchset
 ( cvs diff -u -r 1.83.2.121 -r 1.83.2.122 src/mimeview.c;  cvs diff -u -r 1.204.2.150 -r 1.204.2.151 src/prefs_common.c;  cvs diff -u -r 1.103.2.96 -r 1.103.2.97 src/prefs_common.h;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 manual/advanced.xml;  ) > 3.0.2cvs124.patchset
 ( cvs diff -u -r 1.43.2.90 -r 1.43.2.91 src/toolbar.c;  ) > 3.0.2cvs122.patchset
 ( cvs diff -u -r 1.30.2.46 -r 1.30.2.47 src/prefs_toolbar.c;  cvs diff -u -r 1.43.2.91 -r 1.43.2.92 src/toolbar.c;  cvs diff -u -r 1.19.2.25 -r 1.19.2.26 src/toolbar.h;  ) > 3.0.2cvs123.patchset
 ( cvs diff -u -r 1.83.2.121 -r 1.83.2.122 src/mimeview.c;  cvs diff -u -r 1.204.2.150 -r 1.204.2.151 src/prefs_common.c;  cvs diff -u -r 1.103.2.96 -r 1.103.2.97 src/prefs_common.h;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 manual/advanced.xml;  ) > 3.0.2cvs124.patchset

+( cvs diff -u -r 1.43.2.92 -r 1.43.2.93 src/toolbar.c;  ) > 3.0.2cvs125.patchset

diff --git a/configure.ac b/configure.ac
index ed7ca332c0939d10c70ca5042bbf605ae3caa7ad..15ca44f791f001276a8a672d766c58c050f606e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=124
+EXTRA_VERSION=125

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/toolbar.c b/src/toolbar.c
index fdef575862de84a76a55e5d02abdeaa6d87c2d33..62d26063cf8795f477bfd4661c18575ab8e6946b 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -208,7 +208,7 @@ struct {
 #ifdef USE_ASPELL
        { "A_CHECK_SPELLING",   N_("Check spelling")                       },
 #endif
 #ifdef USE_ASPELL
        { "A_CHECK_SPELLING",   N_("Check spelling")                       },
 #endif

-       { "A_CLAWS_ACTIONS",    N_("Claws Mail Actions Feature")           }, 
+       { "A_SYL_ACTIONS",      N_("Claws Mail Actions Feature")           }, 

        { "A_CANCEL_INC",       N_("Cancel receiving")                     },
        { "A_CLOSE",            N_("Close window")                         },
        { "A_SEPARATOR",        "Separator"                             }
        { "A_CANCEL_INC",       N_("Cancel receiving")                     },
        { "A_CLOSE",            N_("Close window")                         },
        { "A_SEPARATOR",        "Separator"                             }