make toolbar events translatable

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e7cc0fd08d6978504769ae4092af89596d20ff5e..0c49c8dcadb0f73968c6d9a5a05f98e567b3139d 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-11-17 [oliver]    0.8.5claws163
+
+       * src/toolbar.c
+               make toolbar's on click events translatable
+
 2002-11-15 [colin]     0.8.5claws162
 
        * src/summaryview.c

diff --git a/configure.in b/configure.in
index 8e0a071c0292994a62d19ce43e07039dd6498806..383a79e073cc4231bdd8a0e102fe166b6f5ee68e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws162
+EXTRA_VERSION=claws163
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/toolbar.c b/src/toolbar.c
index 21cb29e1cb2916438136aa6f7d8475c02af1bb34..92263fb120cd2b5cc8f82646a4bb735f46b3fb7a 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -71,11 +71,15 @@ static gchar *toolbar_ret_text_from_val      (gint            val);
 static void   toolbar_set_default_main       (void);
 static void   toolbar_set_default_compose    (void);
 
-
+struct ToolbarText 
+{
+       gchar *index_str;
+       const gchar *descr;
+};
 /* 
  *  Text Database linked to enumarated values in toolbar.h 
  */
-static ToolbarText toolbar_text [] = {
+static struct ToolbarText toolbar_text [] = {
        
        { "A_RECEIVE_ALL",   N_("Receive Mail on all Accounts")         },
        { "A_RECEIVE_CUR",   N_("Receive Mail on current Account")      },
@@ -107,7 +111,7 @@ static ToolbarText toolbar_text [] = {
 
 /* struct holds configuration files and a list of
  * currently active toolbar items 
- * TOOLBAR_MAIN and TOOLBAR_COMPOSE give as an index
+ * TOOLBAR_MAIN and TOOLBAR_COMPOSE give us an index
  */
 static ToolbarConfig toolbar_config[2] = {
        { "toolbar_main.xml",    NULL},
@@ -119,7 +123,7 @@ gint toolbar_ret_val_from_descr(const gchar *descr)
        gint i;
 
        for (i = 0; i < N_ACTION_VAL; i++) {
-               if (g_strcasecmp(toolbar_text[i].descr, descr) == 0)
+               if (g_strcasecmp(gettext(toolbar_text[i].descr), descr) == 0)
                                return i;
        }
        
@@ -130,7 +134,7 @@ gchar *toolbar_ret_descr_from_val(gint val)
 {
        g_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
 
-       return toolbar_text[val].descr;
+       return gettext(toolbar_text[val].descr);
 }
 
 static gint toolbar_ret_val_from_text(const gchar *text)
@@ -181,7 +185,7 @@ GList *toolbar_get_action_items(Toolbar source)
                                        A_SYL_ACTIONS };
 
                for (i = 0; i < sizeof(main_items)/sizeof(main_items[0]); i++) 
-                       items = g_list_append(items, toolbar_text[main_items[i]].descr);
+                       items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
        }
        else if (source == TOOLBAR_COMPOSE) {
                gint comp_items[10] = { A_SEND,          A_SENDL,        A_DRAFT,
@@ -190,7 +194,7 @@ GList *toolbar_get_action_items(Toolbar source)
                                        A_SYL_ACTIONS };        
 
                for (i = 0; i < sizeof(comp_items)/sizeof(comp_items[0]); i++) 
-                       items = g_list_append(items, toolbar_text[comp_items[i]].descr);
+                       items = g_list_append(items, gettext(toolbar_text[comp_items[i]].descr));
        }
 
        return items;