2007-11-07 [colin] 3.0.2cvs126

	* src/toolbar.c
		Migrate from A_SYL_ACTIONS to A_CLAWS_ACTIONS

diff --git a/ChangeLog b/ChangeLog
index f0d5311c2c122868cbf6b7d0dda4a562d624cccd..d41aee12c7001f9cdfd7b01d8158b36144296270 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-07 [colin]     3.0.2cvs126
+
+       * src/toolbar.c
+               Migrate from A_SYL_ACTIONS to A_CLAWS_ACTIONS
+
 2007-11-07 [colin]     3.0.2cvs125
 
        * src/toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index 326309afc3d798a88198f18a0d8d008666853baa..e1f95d100fa9e8f92503e62557d1457530e73c96 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3038,3 +3038,4 @@
 ( 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
+( cvs diff -u -r 1.43.2.93 -r 1.43.2.94 src/toolbar.c;  ) > 3.0.2cvs126.patchset

diff --git a/configure.ac b/configure.ac
index 15ca44f791f001276a8a672d766c58c050f606e3..32cfdd04af58e515648820049d4557ae6023a589 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=125
+EXTRA_VERSION=126
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/toolbar.c b/src/toolbar.c
index 62d26063cf8795f477bfd4661c18575ab8e6946b..71efc273ea746884e2627add9013d6b893e743fc 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
-       { "A_SYL_ACTIONS",      N_("Claws Mail Actions Feature")           }, 
+       { "A_CLAWS_ACTIONS",    N_("Claws Mail Actions Feature")           }, 
        { "A_CANCEL_INC",       N_("Cancel receiving")                     },
        { "A_CLOSE",            N_("Close window")                         },
        { "A_SEPARATOR",        "Separator"                             }
@@ -392,6 +392,11 @@ static void toolbar_parse_item(XMLFile *file, ToolbarType source)
                        item->text = g_strdup(_("Trash"));
                        rewrite = TRUE;
                }
+               if (item->index == -1 && !strcmp(value, "A_SYL_ACTIONS")) {
+                       /* switch button */
+                       item->index = A_CLAWS_ACTIONS;
+                       rewrite = TRUE;
+               }
                attr = g_list_next(attr);
        }
        if (item->index != -1) {