commit df1530764c8ec95e52215c70f2977e45c27d37db
parent 36607224d6c35f32d4024ee6b0bde3d9abb950bc
Author: Colin Leroy <colin@colino.net>
Date: Thu, 22 May 2008 06:58:47 +0000
2008-05-22 [colin] 3.4.0cvs62
* src/Makefile.am
* src/prefs_toolbar.c
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/toolbar.c
* src/pixmaps/delete_btn.xpm
* src/pixmaps/insert_file.xpm
* src/pixmaps/mail_reply_to_list.xpm
Fix more of bug 1609:
- Add a Delete button icon
- Add a Reply to list button icon
- Fix Insert file button icon
Artwork by Ciprian Popovici.
Diffstat:
11 files changed, 372 insertions(+), 140 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,19 @@
+2008-05-22 [colin] 3.4.0cvs62
+
+ * src/Makefile.am
+ * src/prefs_toolbar.c
+ * src/stock_pixmap.c
+ * src/stock_pixmap.h
+ * src/toolbar.c
+ * src/pixmaps/delete_btn.xpm
+ * src/pixmaps/insert_file.xpm
+ * src/pixmaps/mail_reply_to_list.xpm
+ Fix more of bug 1609:
+ - Add a Delete button icon
+ - Add a Reply to list button icon
+ - Fix Insert file button icon
+ Artwork by Ciprian Popovici.
+
2008-05-21 [colin] 3.4.0cvs61
* src/common/utils.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3357,3 +3357,4 @@
( cvs diff -u -r 1.274.2.242 -r 1.274.2.243 src/mainwindow.c; ) > 3.4.0cvs59.patchset
( cvs diff -u -r 1.59.2.68 -r 1.59.2.69 src/prefs_filtering.c; ) > 3.4.0cvs60.patchset
( cvs diff -u -r 1.36.2.140 -r 1.36.2.141 src/common/utils.c; ) > 3.4.0cvs61.patchset
+( cvs diff -u -r 1.155.2.85 -r 1.155.2.86 src/Makefile.am; cvs diff -u -r 1.30.2.50 -r 1.30.2.51 src/prefs_toolbar.c; cvs diff -u -r 1.25.2.55 -r 1.25.2.56 src/stock_pixmap.c; cvs diff -u -r 1.18.2.34 -r 1.18.2.35 src/stock_pixmap.h; cvs diff -u -r 1.43.2.99 -r 1.43.2.100 src/toolbar.c; diff -u /dev/null src/pixmaps/delete_btn.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/insert_file.xpm; diff -u /dev/null src/pixmaps/mail_reply_to_list.xpm; ) > 3.4.0cvs62.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=62
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -344,6 +344,7 @@ EXTRA_DIST = \
pixmaps/close.xpm \
pixmaps/complete.xpm \
pixmaps/continue.xpm \
+ pixmaps/delete_btn.xpm \
pixmaps/deleted.xpm \
pixmaps/dir_close.xpm \
pixmaps/dir_close_hrm.xpm \
@@ -383,6 +384,7 @@ EXTRA_DIST = \
pixmaps/mail_receive.xpm \
pixmaps/mail_reply_to_all.xpm \
pixmaps/mail_reply_to_author.xpm \
+ pixmaps/mail_reply_to_list.xpm \
pixmaps/mail_reply.xpm \
pixmaps/mail_send_queue.xpm \
pixmaps/mail_send.xpm \
diff --git a/src/pixmaps/delete_btn.xpm b/src/pixmaps/delete_btn.xpm
@@ -0,0 +1,124 @@
+/* XPM */
+static char * delete_btn_xpm[] = {
+"24 24 97 2",
+" c None",
+". c #999999",
+"+ c #000000",
+"@ c #929292",
+"# c #535353",
+"$ c #FFFFFF",
+"% c #FEFEFE",
+"& c #FDFDFD",
+"* c #FCFCFC",
+"= c #FBFBFB",
+"- c #F9F9F9",
+"; c #F8F8F8",
+"> c #F7F7F7",
+", c #F6F6F6",
+"' c #F5F5F5",
+") c #F4F4F4",
+"! c #E3E3E3",
+"~ c #EEEEEE",
+"{ c #4F4F4F",
+"] c #F3F3F3",
+"^ c #F2F2F2",
+"/ c #F1F1F1",
+"( c #F0F0F0",
+"_ c #EFEFEF",
+": c #EDEDED",
+"< c #AEAEAE",
+"[ c #E4E4E4",
+"} c #434343",
+"| c #ACACAC",
+"1 c #C8C8C8",
+"2 c #A0A0A0",
+"3 c #D4D4D4",
+"4 c #ECECEC",
+"5 c #959595",
+"6 c #3E3E3E",
+"7 c #4D4D4D",
+"8 c #818181",
+"9 c #C6C6C6",
+"0 c #6A6A6A",
+"a c #636363",
+"b c #B9B9B9",
+"c c #737373",
+"d c #9AB5CF",
+"e c #8FABC7",
+"f c #8EABC6",
+"g c #8DAAC6",
+"h c #8DA9C4",
+"i c #8BA8C3",
+"j c #8BA7C2",
+"k c #8AA6C2",
+"l c #88A6C2",
+"m c #87A5C1",
+"n c #87A4C0",
+"o c #86A3BF",
+"p c #84A2BF",
+"q c #FF2C2C",
+"r c #7F9EBA",
+"s c #7E9DBA",
+"t c #7E9CB9",
+"u c #7090AE",
+"v c #6F8FAE",
+"w c #6E8FAD",
+"x c #6D8EAC",
+"y c #6D8DAB",
+"z c #6B8CAA",
+"A c #6A8BAA",
+"B c #698AA9",
+"C c #6889A8",
+"D c #6789A7",
+"E c #6687A7",
+"F c #6587A6",
+"G c #6486A5",
+"H c #6385A5",
+"I c #6384A4",
+"J c #6283A3",
+"K c #6182A2",
+"L c #6081A1",
+"M c #5F81A1",
+"N c #517596",
+"O c #507496",
+"P c #4F7395",
+"Q c #4E7394",
+"R c #4D7293",
+"S c #4C7092",
+"T c #4B6F92",
+"U c #4A6F91",
+"V c #496E90",
+"W c #486D8F",
+"X c #476D8F",
+"Y c #466C8E",
+"Z c #466B8D",
+"` c #44698C",
+" . c #43688C",
+".. c #43688B",
+"+. c #41678A",
+"@. c #406689",
+"#. c #406588",
+" ",
+" . + + + + + + + + + + + + + + + + + @ ",
+" + # $ $ $ $ % & * = - ; > , ' ) ! # + ",
+" + ~ { $ ' ) ] ^ ^ / ( ( _ ~ : ! { < + ",
+" + $ [ } & ] ^ ^ / ( _ ~ ~ : ! { | 1 + ",
+" + $ ' [ { = / ( ( _ ~ : : ! } 2 3 1 + ",
+" + $ = ' [ } ; ( _ ~ : 4 ! { 5 3 [ 1 + ",
+" + $ ' ' ' [ 6 ' ~ : 4 ! 7 8 9 [ [ 1 + ",
+" + $ = ' ' [ 0 } ] 4 ! { 0 9 9 ' [ 1 + ",
+" + $ ' ' [ a $ b { ( { 5 9 c 9 ' [ 1 + ",
+" + + + + + + + + + + + + + + + + + + + + + ",
+" + + + + + + + + + + + + + + + + + + + + + + + ",
+" + + d d d d d d d d d d d d d d d d d d d + + ",
+" + + e f g h i j k l m n o p q q q q r s t + + ",
+" + + u v w x y z A B C D E F G H I J K L M + + ",
+" + + N O P Q R S T U V W X Y Z ` ...+.@.#.+ + ",
+" + + + + + + + + + + + + + + + + + + + + + + + ",
+" + + + + + + + + + + + + + + + + + + + + + ",
+" + = + = = + + = = + = = + = + = = + ",
+" + = + = = + + = + + = = + = + = = + ",
+" + = + = = + + + + + = = + = + = = + ",
+" + + + = + + + + = + + + = + + ",
+" + + + + + + + + ",
+" "};
diff --git a/src/pixmaps/insert_file.xpm b/src/pixmaps/insert_file.xpm
@@ -1,137 +1,102 @@
/* XPM */
static char * insert_file_xpm[] = {
-"24 24 110 2",
-" c None",
-". c #ABABAB",
-"+ c #141414",
-"@ c #191919",
-"# c #101010",
-"$ c #0D0D0D",
-"% c #B9B9B9",
-"& c #000000",
-"* c #FEFEFE",
-"= c #F9F9F9",
-"- c #757575",
-"; c #AFAFAF",
-"> c #F5F5E8",
-", c #565651",
-"' c #FFFFFF",
-") c #A0A0A0",
-"! c #939393",
-"~ c #7C7C7C",
-"{ c #C5C5BB",
-"] c #CFC6A0",
-"^ c #D7CEAA",
-"/ c #ADA689",
-"( c #4B483C",
-"_ c #6D6D6D",
-": c #6C6C6C",
-"< c #A9A9A9",
-"[ c #3D3A30",
-"} c #979178",
-"| c #C1B898",
-"1 c #8A793D",
-"2 c #C3BB9A",
-"3 c #AFA78A",
-"4 c #444236",
-"5 c #FAFAFA",
-"6 c #EFEFEF",
-"7 c #C7C7C7",
-"8 c #D8D8D8",
-"9 c #D2D2D2",
-"0 c #7B7B7B",
-"a c #302E26",
-"b c #89846C",
-"c c #C4BC9A",
-"d c #847235",
-"e c #C5C5C5",
-"f c #A7A7A7",
-"g c #ADADAD",
-"h c #9A9A9A",
-"i c #9B9B9B",
-"j c #868686",
-"k c #424242",
-"l c #847033",
-"m c #C9C09E",
-"n c #464337",
-"o c #35332A",
-"p c #2D2B23",
-"q c #C6BE9D",
-"r c #826F33",
-"s c #7F7964",
-"t c #4C493C",
-"u c #171612",
-"v c #13120F",
-"w c #3E3B31",
-"x c #282210",
-"y c #404040",
-"z c #363636",
-"A c #252525",
-"B c #B0B0B0",
-"C c #474438",
-"D c #B3B3B3",
-"E c #D6D6D6",
-"F c #1B1B1B",
-"G c #B7AE90",
-"H c #B1AA8C",
-"I c #37352B",
-"J c #151410",
-"K c #8F8F8F",
-"L c #989898",
-"M c #C6C6C6",
-"N c #020202",
-"O c #B9B293",
-"P c #11100D",
-"Q c #434035",
-"R c #636363",
-"S c #767676",
-"T c #131313",
-"U c #AAA48B",
-"V c #A5A086",
-"W c #A19A7F",
-"X c #312F26",
-"Y c #121212",
-"Z c #AFA88C",
-"` c #050403",
-" . c #12110E",
-".. c #030303",
-"+. c #A9A489",
-"@. c #A39E85",
-"#. c #EBE7D0",
-"$. c #D2C9A5",
-"%. c #A29053",
-"&. c #8E7C3D",
-"*. c #88793B",
-"=. c #806C2F",
-"-. c #78652B",
-";. c #251F0C",
-">. c #222222",
-",. c #969696",
-"'. c #3D3D3D",
-"). c #0B0B0B",
-"!. c #060606",
-"~. c #929292",
-" . + @ # $ % ",
-"% & & & & & & % * = - & & & & & & ; ",
-"& > > > > > , ' ) ! ~ , { > > > ] & ",
-"& > ^ ^ ^ / ( ' _ : < [ } | ^ ^ 1 & ",
-"& > 2 2 3 4 5 6 7 8 9 0 a b 3 c d & ",
-"& > ^ ^ ( e f f g h i j k ( / ^ l & ",
-"& > m 2 b n o p p p p p a b 3 q r & ",
-"& > ^ ^ ^ } } } } } } } } | ^ ^ r & ",
-"& > m 2 2 2 2 s t u v v v v [ w x & y z A B ",
-"& > ^ ^ ^ ^ ^ C D ' ' ' ' ' ' ' ' ' ' ' E F ",
-"& > G H H H H I ' ' ' ' ' ' ' ' ' ' ' ' ' + ",
-"& > ^ ^ ^ ^ ^ J ' f K K L ' ' M K ' K M ' N ",
-"& > O H H H H P ' ' ' ' ' ' ' ' ' ' ' ' ' N ",
-"& > ^ ^ ^ ^ ^ Q ' _ R ' S K K M ' M K ' ' T ",
-"& > U V W W W X ' ' ' ' ' ' ' ' ' ' ' ' ' Y ",
-"& > ^ ^ ^ ^ ^ Q ' f K K ' K K K M ' L K ' T ",
-"& > Z V W W W ` ' ' ' ' ' ' ' ' ' ' ' ' ' & ",
-"& > ^ ^ ^ ^ ^ .' _ R ' S K K M ' M K ' ' .. ",
-"& > +.@.W W W X ' ' ' ' ' ' ' ' ' ' ' ' ' Y ",
-"& #.^ ^ ^ ^ ^ Q ' f K K ' K K K M ' L K ' T ",
-"& $.%.&.*.=.-.;.' ' ' ' ' ' ' ' ' ' ' ' ' T ",
-"% & & & & & & & E ' ' ' ' ' ' ' ' ' ' ' E >. ",
-" ,.'.T Y T ).!.>.>.>.>.>.>.A ~. ",
-" "};
+"24 24 75 1",
+" c None",
+". c #000000",
+"+ c #B8CADB",
+"@ c #C5D4E3",
+"# c #687B8D",
+"$ c #D8D8D8",
+"% c #CFDBE6",
+"& c #9DB8D2",
+"* c #728699",
+"= c #BCCEDF",
+"- c #FFFFFF",
+"; c #D2DEEA",
+"> c #C0D1E2",
+", c #CFDBE7",
+"' c #798EA3",
+") c #D0DDE9",
+"! c #B7CBDE",
+"~ c #B6CADD",
+"{ c #B7CADD",
+"] c #BACCDF",
+"^ c #9FB9D3",
+"/ c #B5C9DC",
+"( c #9BB6D0",
+"_ c #7F7964",
+": c #4C493C",
+"< c #171612",
+"[ c #13120F",
+"} c #AFC5DA",
+"| c #A0BAD3",
+"1 c #7E94A9",
+"2 c #474438",
+"3 c #B3B3B3",
+"4 c #B2C7DB",
+"5 c #9CB7D1",
+"6 c #A4BDD5",
+"7 c #BABABA",
+"8 c #37352B",
+"9 c #151410",
+"0 c #A7A7A7",
+"a c #8F8F8F",
+"b c #11100D",
+"c c #9AB5CF",
+"d c #434035",
+"e c #6D6D6D",
+"f c #5B88B2",
+"g c #9EB8D1",
+"h c #556474",
+"i c #2A303A",
+"j c #312F26",
+"k c #5080AD",
+"l c #3F6588",
+"m c #2A435B",
+"n c #121212",
+"o c #97B3CE",
+"p c #131313",
+"q c #050403",
+"r c #080D11",
+"s c #5F8BB4",
+"t c #95B2CE",
+"u c #12110E",
+"v c #636363",
+"w c #767676",
+"x c #4C79A3",
+"y c #C6C6C6",
+"z c #030303",
+"A c #989898",
+"B c #251F0C",
+"C c #D6D6D6",
+"D c #222222",
+"E c #969696",
+"F c #3D3D3D",
+"G c #0B0B0B",
+"H c #060606",
+"I c #252525",
+"J c #929292",
+" ",
+" ............ ",
+" .+@#$$$$$$%&*. ",
+" .=&#------;&*. ",
+" .>&#$$$$$$,&*. ",
+" .>&'------)&*. ",
+" ....>&&!~~{{]^&*. ",
+" ./(.>&&&&&&&&&&*. ",
+" _:<[[.}|.>&&111111&&*. ",
+" 23---.45.>61$$7$-$1&*. ",
+" 8----.~5.>&1$7$-1$1&*. ",
+" 9-0aa.~(.>&1$7-$1$1&*. ",
+" b-....~c.=&17$-$$$1**. ",
+" d-e.fg6|5.h........i. ",
+" j---.k555llm.-n ",
+" d-0aa.ko|lm.a-p ",
+" q-----rstm.---. ",
+" u-ev-wa.x.ya--z ",
+" j-------.-----n ",
+" d-0aa-aaay-Aa-p ",
+" B-------------p ",
+" .C-----------CD ",
+" EFpnpGHDDDDDDIJ ",
+" "};
diff --git a/src/pixmaps/mail_reply_to_list.xpm b/src/pixmaps/mail_reply_to_list.xpm
@@ -0,0 +1,117 @@
+/* XPM */
+static char * mail_reply_to_list_xpm[] = {
+"24 24 90 1",
+" c None",
+". c #434035",
+"+ c #3D3A30",
+"@ c #3E3B31",
+"# c #282210",
+"$ c #000000",
+"% c #404040",
+"& c #363636",
+"* c #252525",
+"= c #B0B0B0",
+"- c #312F26",
+"; c #FFFFFF",
+"> c #D6D6D6",
+", c #1B1B1B",
+"' c #A7A7A7",
+") c #8F8F8F",
+"! c #141414",
+"~ c #999999",
+"{ c #050403",
+"] c #020202",
+"^ c #535353",
+"/ c #FEFEFE",
+"( c #FDFDFD",
+"_ c #FCFCFC",
+": c #FBFBFB",
+"< c #F9F9F9",
+"[ c #F8F8F8",
+"} c #12110E",
+"| c #6D6D6D",
+"1 c #636363",
+"2 c #767676",
+"3 c #EEEEEE",
+"4 c #4F4F4F",
+"5 c #F5F5F5",
+"6 c #F4F4F4",
+"7 c #F3F3F3",
+"8 c #F2F2F2",
+"9 c #F1F1F1",
+"0 c #F0F0F0",
+"a c #131313",
+"b c #E4E4E4",
+"c c #434343",
+"d c #EFEFEF",
+"e c #121212",
+"f c #EDEDED",
+"g c #251F0C",
+"h c #ECECEC",
+"i c #3E3E3E",
+"j c #E3E3E3",
+"k c #969696",
+"l c #3D3D3D",
+"m c #0B0B0B",
+"n c #060606",
+"o c #222222",
+"p c #3D1A13",
+"q c #6A6A6A",
+"r c #C6C6C6",
+"s c #C8C8C8",
+"t c #B9B9B9",
+"u c #959595",
+"v c #737373",
+"w c #EAC0BA",
+"x c #D4D4D4",
+"y c #ACACAC",
+"z c #7C7C7C",
+"A c #DF9E95",
+"B c #E0A198",
+"C c #E1A59D",
+"D c #E2A79E",
+"E c #E3ABA3",
+"F c #E3AAA2",
+"G c #CC6253",
+"H c #DD978D",
+"I c #DF9F97",
+"J c #DE9A90",
+"K c #DD968C",
+"L c #DD948A",
+"M c #B14334",
+"N c #BCBCBC",
+"O c #431913",
+"P c #EAC2BC",
+"Q c #DF9C92",
+"R c #DD998F",
+"S c #B54535",
+"T c #787878",
+"U c #65261D",
+"V c #983A2C",
+"W c #7C2F24",
+"X c #63251D",
+"Y c #6C291F",
+" .+@#$%&*=",
+" -;;;;;;>,",
+" .;')););!",
+" ~$$$$$$$$$$${;;;;;;;]",
+" $^;;;;/(_:<[};|1;2);]",
+" $34;56788900-;;;;;;;a",
+" $;bc(78890d3.;')););e",
+" $;5b4:900d3fg;;;;;;;a",
+" $;:5bc[0d3fh$>;;;;;;$",
+" $;555bi53fhjklaeamnoo",
+" $;:p5bqc7hj4qrr5bs$ ",
+" $;$$b1;t404urvr5bs$ ",
+" $$w$1;5bx4yrbbzbbs$ ",
+" $wA$$$$$$$b555bzbs$ ",
+" $wBCDEDFAG$bbbbbbzs$ ",
+" $wHIAJKKJLM$NNNNNNN1$ ",
+"OPJQRRHJJJJS$$$$$$$$$T ",
+" $UVVVVVVVVW$ ",
+" $UVVXXXXXY$ ",
+" $UV$$$$$$$ ",
+" $U$ ",
+" $$ ",
+" $ ",
+" "};
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -97,6 +97,7 @@ static const gint ToolbarIcons[] =
STOCK_PIXMAP_MAIL_REPLY,
STOCK_PIXMAP_MAIL_REPLY_TO_ALL,
STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR,
+ STOCK_PIXMAP_MAIL_REPLY_TO_LIST,
STOCK_PIXMAP_MAIL_SEND,
STOCK_PIXMAP_MAIL_SEND_QUEUE,
STOCK_PIXMAP_MAIL_SIGN,
@@ -139,7 +140,7 @@ static const gint ToolbarIcons[] =
STOCK_PIXMAP_SPAM_BTN,
STOCK_PIXMAP_HAM_BTN,
STOCK_PIXMAP_TRASH,
- STOCK_PIXMAP_DELETED,
+ STOCK_PIXMAP_DELETE,
STOCK_PIXMAP_EMPTY, /* last entry */
};
@@ -1099,7 +1100,7 @@ static GtkWidget *create_set_list_view(ToolbarPage *prefs_toolbar)
gtk_tree_view_column_set_title(column, _("Icon"));
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start(column, renderer, FALSE);
-
+ gtk_tree_view_set_reorderable(list_view, TRUE);
/* tell pixbuf renderer it is only visible if
* the icon is not represented by text */
gtk_tree_view_column_set_cell_data_func(column, renderer,
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -70,6 +70,7 @@
#include "pixmaps/mail_reply.xpm"
#include "pixmaps/mail_reply_to_all.xpm"
#include "pixmaps/mail_reply_to_author.xpm"
+#include "pixmaps/mail_reply_to_list.xpm"
#include "pixmaps/mail_send.xpm"
#include "pixmaps/mail_send_queue.xpm"
#include "pixmaps/mail_sign.xpm"
@@ -143,6 +144,7 @@
#include "pixmaps/outbox_close.xpm"
#include "pixmaps/outbox_close_hrm.xpm"
#include "pixmaps/trash.xpm"
+#include "pixmaps/delete_btn.xpm"
#include "pixmaps/trash_btn.xpm"
#include "pixmaps/trash_hrm.xpm"
#include "pixmaps/drafts_close.xpm"
@@ -285,6 +287,7 @@ static StockPixmapData pixmaps[] =
{mail_reply_xpm , NULL, NULL, "mail_reply", NULL},
{mail_reply_to_all_xpm , NULL, NULL, "mail_reply_to_all", NULL},
{mail_reply_to_author_xpm , NULL, NULL, "mail_reply_to_author", NULL},
+ {mail_reply_to_list_xpm , NULL, NULL, "mail_reply_to_list", NULL},
{mail_send_xpm , NULL, NULL, "mail_send", NULL},
{mail_send_queue_xpm , NULL, NULL, "mail_send_queue", NULL},
{mail_sign_xpm , NULL, NULL, "mail_sign", NULL},
@@ -361,6 +364,7 @@ static StockPixmapData pixmaps[] =
{mime_message_xpm , NULL, NULL, "mime_message", NULL},
{claws_mail_icon_xpm , NULL, NULL, "claws_mail_icon", NULL},
{read_xpm , NULL, NULL, "read", NULL},
+ {delete_btn_xpm , NULL, NULL, "delete_btn", NULL},
{trash_btn_xpm , NULL, NULL, "trash_btn", NULL},
#ifndef GENERIC_UMPC
{claws_mail_logo_xpm , NULL, NULL, "claws_mail_logo", NULL},
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
@@ -84,6 +84,7 @@ typedef enum
STOCK_PIXMAP_MAIL_REPLY,
STOCK_PIXMAP_MAIL_REPLY_TO_ALL,
STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR,
+ STOCK_PIXMAP_MAIL_REPLY_TO_LIST,
STOCK_PIXMAP_MAIL_SEND,
STOCK_PIXMAP_MAIL_SEND_QUEUE,
STOCK_PIXMAP_MAIL_SIGN,
@@ -160,6 +161,7 @@ typedef enum
STOCK_PIXMAP_MIME_MESSAGE,
STOCK_PIXMAP_CLAWS_MAIL_ICON,
STOCK_PIXMAP_READ,
+ STOCK_PIXMAP_DELETE,
STOCK_PIXMAP_TRASH,
STOCK_PIXMAP_CLAWS_MAIL_LOGO,
STOCK_PIXMAP_DIR_NOSELECT,
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -468,10 +468,10 @@ gint toolbar_get_icon(int action) {
case A_REPLY_MESSAGE: return STOCK_PIXMAP_MAIL_REPLY;
case A_REPLY_ALL: return STOCK_PIXMAP_MAIL_REPLY_TO_ALL;
case A_REPLY_SENDER: return STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR;
- case A_REPLY_ML: return STOCK_PIXMAP_MAIL_REPLY;
+ case A_REPLY_ML: return STOCK_PIXMAP_MAIL_REPLY_TO_LIST;
case A_FORWARD: return STOCK_PIXMAP_MAIL_FORWARD;
case A_TRASH: return STOCK_PIXMAP_TRASH;
- case A_DELETE_REAL: return STOCK_PIXMAP_DELETED;
+ case A_DELETE_REAL: return STOCK_PIXMAP_DELETE;
case A_LEARN_SPAM: return STOCK_PIXMAP_SPAM_BTN;
case A_GOTO_PREV: return STOCK_PIXMAP_UP_ARROW;
case A_GOTO_NEXT: return STOCK_PIXMAP_DOWN_ARROW;
