From 9710f404f5b8c4d3daac1f881dd3b67790bfa494 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey@novell.com>
Date: Thu, 27 Apr 2006 16:46:21 +0000
Subject: Don't set gtk-delete as the stock icon for Empty Trash
2006-04-27 Rodney Dawes <dobey@novell.com>
* evolution-mail-global.xml: Don't set gtk-delete as the stock icon
for Empty Trash
* evolution-mail-message.xml: Set the MessageDelete icon as a pixbuf
from the code
Don't set an icon for MessageUndelete
Fixes #339626
svn path=/trunk/; revision=31921
---
ui/ChangeLog | 11 +++++++++++
ui/evolution-mail-global.xml | 2 +-
ui/evolution-mail-message.xml | 7 +++----
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 2f003db8a1..267361de95 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-27 Rodney Dawes <dobey@novell.com>
+
+ * evolution-mail-global.xml: Don't set gtk-delete as the stock icon
+ for Empty Trash
+
+ * evolution-mail-message.xml: Set the MessageDelete icon as a pixbuf
+ from the code
+ Don't set an icon for MessageUndelete
+
+ Fixes #339626
+
2006-04-26 Srinivasa Ragavan <sragavan@novell.com>
** Committing patch from PR Suman for adding missing icons to menus.
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 94d7af422f..9626907c47 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -45,7 +45,7 @@
<submenu name="File">
<placeholder name="EmptyTrashPlaceholder">
- <menuitem name="EmptyTrash" verb="" _label="Empty _Trash" pixtype="stock" pixname="gtk-delete"/>
+ <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
</placeholder>
</submenu>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index ea624d29fe..e3003fa9d9 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -59,7 +59,7 @@
<cmd name="MessageDelete"
_tip="Mark the selected messages for deletion"
accel="*Control*d"
- pixtype="stock" pixname="gtk-delete"/>
+ pixtype="pixbuf"/>
<cmd name="MessageFollowUpFlag"
_tip="Flag selected messages for follow-up"
@@ -166,8 +166,7 @@
<cmd name="MessageUndelete"
_tip="Undelete the selected messages"
- accel="*Control**Shift*d"
- pixtype="stock" pixname="gtk-undelete"/>
+ accel="*Control**Shift*d"/>
<cmd name="PrintMessage"
_tip="Print this message"
@@ -421,7 +420,7 @@
<toolitem name="MessageDelete" verb=""
_label="Delete"
- pixtype="stock" pixname="gtk-delete"/>
+ pixtype="pixbuf"/>
<toolitem name="MessageMarkAsJunk" verb=""
_label="Junk"
--
cgit v1.2.3