aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--art/ChangeLog4
-rw-r--r--art/Makefile.am1
-rw-r--r--art/delete-message.png (renamed from art/delete_message.png)bin1210 -> 1210 bytes
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/folder-browser-ui.c1
-rw-r--r--ui/ChangeLog5
-rw-r--r--ui/evolution-mail-message.xml2
7 files changed, 16 insertions, 1 deletions
diff --git a/art/ChangeLog b/art/ChangeLog
index d3ab2ff4e4..eab3a11c52 100644
--- a/art/ChangeLog
+++ b/art/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-18 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am (buttons_DATA): Added `delete-message.png'.
+
2001-08-17 Damon Chaplin <damon@ximian.com>
* Makefile.am (images_DATA): moved task.xpm here, so it gets installed,
diff --git a/art/Makefile.am b/art/Makefile.am
index 7dd62f7ebf..20e4619260 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -127,6 +127,7 @@ buttons_DATA = \
compose-message.png \
copy-message.png \
dayview.xpm \
+ delete-message.png \
fetch-mail.png \
forward.png \
goto-24.png \
diff --git a/art/delete_message.png b/art/delete-message.png
index 1bec6baac7..1bec6baac7 100644
--- a/art/delete_message.png
+++ b/art/delete-message.png
Binary files differ
diff --git a/mail/ChangeLog b/mail/ChangeLog
index eebd24807b..f281e9ba0e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-18 Ettore Perazzoli <ettore@ximian.com>
+
+ * folder-browser-ui.c: Hook the new `delete-message.png' up.
+
2001-08-17 Damon Chaplin <damon@ximian.com>
* mail-display.c (pixmap_press): stop signal emission so the GtkButton
diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
index 27eeafb699..e21f02d54e 100644
--- a/mail/folder-browser-ui.c
+++ b/mail/folder-browser-ui.c
@@ -132,6 +132,7 @@ static EPixmap message_pixcache [] = {
E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "buttons/print.png"),
E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "buttons/move-message.png"),
E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "buttons/copy-message.png"),
+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "buttons/delete-message.png"),
E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "buttons/next-message.png"),
E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "buttons/previous-message.png"),
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 91cb7d3e92..e590f8b643 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-18 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution-mail-message.xml: Change pixtype of "MessageDelete" to
+ "pixbuf".
+
2001-08-18 Damon Chaplin <damon@ximian.com>
* evolution-calendar.xml: changed goto icon from stock icon to pixbuf
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index bf8e7aebd0..388dcc0b0f 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -309,7 +309,7 @@
<toolitem name="MessageDelete" verb=""
_label="Delete"
- pixtype="stock" pixname="Trash"/>
+ pixtype="pixbuf"/>
</placeholder>
<placeholder name="MailNextButtons">