From: Paul Mangan Date: Sat, 24 Mar 2007 10:01:35 +0000 (+0000) Subject: 2007-03-24 [paul] 2.8.1cvs45 X-Git-Tag: rel_2_9_0~60 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4771dfad6a271431c65eb775f68592b91dc8f26c 2007-03-24 [paul] 2.8.1cvs45 * src/toolbar.c fix toolbar (broken in 2.8.1cvs42) --- diff --git a/ChangeLog b/ChangeLog index 893a79047..22f5909a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-24 [paul] 2.8.1cvs45 + + * src/toolbar.c + fix toolbar (broken in 2.8.1cvs42) + 2007-03-23 [colin] 2.8.1cvs44 * src/imap.c diff --git a/PATCHSETS b/PATCHSETS index 8974b9996..a4441d7b0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2461,3 +2461,4 @@ ( cvs diff -u -r 1.155.2.56 -r 1.155.2.57 src/Makefile.am; cvs diff -u -r 1.382.2.362 -r 1.382.2.363 src/compose.c; cvs diff -u -r 1.50.2.32 -r 1.50.2.33 src/compose.h; cvs diff -u -r 1.25.2.33 -r 1.25.2.34 src/stock_pixmap.c; cvs diff -u -r 1.18.2.24 -r 1.18.2.25 src/stock_pixmap.h; cvs diff -u -r 1.395.2.290 -r 1.395.2.291 src/summaryview.c; cvs diff -u -r 1.68.2.34 -r 1.68.2.35 src/summaryview.h; cvs diff -u -r 1.43.2.61 -r 1.43.2.62 src/toolbar.c; cvs diff -u -r 1.19.2.15 -r 1.19.2.16 src/toolbar.h; diff -u /dev/null src/pixmaps/open_mail.xpm; ) > 2.8.1cvs42.patchset ( cvs diff -u -r 1.204.2.125 -r 1.204.2.126 src/prefs_common.c; ) > 2.8.1cvs43.patchset ( cvs diff -u -r 1.179.2.160 -r 1.179.2.161 src/imap.c; ) > 2.8.1cvs44.patchset +( cvs diff -u -r 1.43.2.62 -r 1.43.2.63 src/toolbar.c; ) > 2.8.1cvs45.patchset diff --git a/configure.ac b/configure.ac index 3b145988c..cc6f6ddfb 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=44 +EXTRA_VERSION=45 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/toolbar.c b/src/toolbar.c index 5fb7023c5..3ba07a90b 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -36,6 +36,7 @@ #include #include +#include "main.h" #include "mainwindow.h" #include "summaryview.h" #include "compose.h" @@ -176,6 +177,7 @@ struct { { "A_REPLY_SENDER", N_("Reply to Sender") }, { "A_REPLY_ALL", N_("Reply to All") }, { "A_REPLY_ML", N_("Reply to Mailing-list") }, + { "A_OPEN_MAIL", N_("Open email") }, { "A_FORWARD", N_("Forward Message") }, { "A_TRASH", N_("Trash Message") }, { "A_DELETE_REAL", N_("Delete Message") }, @@ -201,7 +203,6 @@ struct { #endif { "A_SYL_ACTIONS", N_("Claws Mail Actions Feature") }, { "A_CANCEL_INC", N_("Cancel receiving") }, - { "A_OPEN_MAIL", N_("Open email") }, { "A_CLOSE", N_("Close window") }, { "A_SEPARATOR", "Separator" } }; @@ -319,7 +320,7 @@ GList *toolbar_get_action_items(ToolbarType source) if (source == TOOLBAR_MAIN) { gint main_items[] = { A_RECEIVE_ALL, A_RECEIVE_CUR, A_SEND_QUEUED, A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER, - A_REPLY_ALL, A_REPLY_ML, A_FORWARD, + A_REPLY_ALL, A_REPLY_ML, A_OPEN_MAIL, A_FORWARD, A_TRASH , A_DELETE_REAL, A_EXECUTE, A_GOTO_PREV, A_GOTO_NEXT, A_IGNORE_THREAD, A_PRINT, A_ADDRBOOK, A_LEARN_SPAM, A_SYL_ACTIONS, A_CANCEL_INC }; @@ -336,7 +337,7 @@ GList *toolbar_get_action_items(ToolbarType source) #ifdef USE_ASPELL A_CHECK_SPELLING, #endif - A_SYL_ACTIONS }; + A_SYL_ACTIONS, A_CLOSE }; for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++) items = g_list_append(items, gettext(toolbar_text[comp_items[i]].descr)); @@ -345,7 +346,7 @@ GList *toolbar_get_action_items(ToolbarType source) gint msgv_items[] = { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER, A_REPLY_ALL, A_REPLY_ML, A_FORWARD, A_TRASH, A_DELETE_REAL, A_GOTO_PREV, A_GOTO_NEXT, - A_ADDRBOOK, A_LEARN_SPAM, A_SYL_ACTIONS }; + A_ADDRBOOK, A_LEARN_SPAM, A_SYL_ACTIONS, A_CLOSE }; for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++) items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));