talons

commit b5cb37d2b7ee9658ab1c21539e584d4bd09dbf54
parent 6766d314f81630fc7db919772b83456f8265150d
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 30 Apr 2008 20:57:52 +0000

2008-04-30 [colin]	3.4.0cvs19

	* src/prefs_toolbar.c
		Add Trash and Delete icons to the icon chooser

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_toolbar.c
 | 
2
++

4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-30 [colin]	3.4.0cvs19
+
+	* src/prefs_toolbar.c
+		Add Trash and Delete icons to the icon chooser
+
 2008-04-30 [colin]	3.4.0cvs18
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3314,3 +3314,4 @@
 ( cvs diff -u -r 1.213.2.181 -r 1.213.2.182 src/folder.c;  cvs diff -u -r 1.36.2.137 -r 1.36.2.138 src/common/utils.c;  ) > 3.4.0cvs16.patchset
 ( cvs diff -u -r 1.382.2.444 -r 1.382.2.445 src/compose.c;  ) > 3.4.0cvs17.patchset
 ( cvs diff -u -r 1.382.2.445 -r 1.382.2.446 src/compose.c;  ) > 3.4.0cvs18.patchset
+( cvs diff -u -r 1.30.2.48 -r 1.30.2.49 src/prefs_toolbar.c;  ) > 3.4.0cvs19.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=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -138,6 +138,8 @@ static const gint ToolbarIcons[] =
 	STOCK_PIXMAP_MIME_MESSAGE,
 	STOCK_PIXMAP_SPAM_BTN,
 	STOCK_PIXMAP_HAM_BTN,
+	STOCK_PIXMAP_TRASH,
+	STOCK_PIXMAP_DELETED,
 	STOCK_PIXMAP_EMPTY,              /* last entry */
 };