From c01df5acc66b878c5c46a0b68f9dc959526d7247 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 7 Oct 2009 11:15:58 +0200
Subject: Enable File->Empty Trash menu item for all folders

---
 modules/mail/e-mail-shell-view-actions.c | 9 ++++++++-
 ui/evolution-mail.ui                     | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index e47c9fd7c6..22aa88edcf 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1048,13 +1048,20 @@ static GtkActionEntry mail_entries[] = {
 	  N_("Download messages of accounts and folders marked for offline"),
 	  G_CALLBACK (action_mail_download_cb) },
 
-	{ "mail-empty-trash",
+	{ "mail-empty-trashes", /* this is File->Empty Trash action */
 	  NULL,
 	  N_("Empty _Trash"),
 	  NULL,
 	  N_("Permanently remove all the deleted messages from all folders"),
 	  G_CALLBACK (action_mail_empty_trash_cb) },
 
+	{ "mail-empty-trash", /* this is a popup action over the trash folder */
+	  NULL,
+	  N_("_Empty Trash"),
+	  NULL,
+	  N_("Permanently remove all the deleted messages from all folders"),
+	  G_CALLBACK (action_mail_empty_trash_cb) },
+
 	{ "mail-flush-outbox",
 	  "mail-send",
 	  N_("Fl_ush Outbox"),
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 6b43270ddc..c35ddbc8d4 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -2,7 +2,7 @@
   <menubar name='main-menu'>
     <menu action='file-menu'>
       <placeholder name='long-running-actions'>
-        <menuitem action='mail-empty-trash'/>
+        <menuitem action='mail-empty-trashes'/>
         <menuitem action='mail-download'/>
       </placeholder>
     </menu>
-- 
cgit v1.2.3