[evolution] Bug #549988 - "Empty Trash" in Trash popup empties all Trash folders

[Milan Crha <mcrha src gnome org>]

commit 5f1c9ff19d80bb50cd00114b8fb633d8eba3365f
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 6 13:35:05 2010 +0100

    Bug #549988 - "Empty Trash" in Trash popup empties all Trash folders

 modules/mail/e-mail-shell-view-actions.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 139dd94..94b7b7b 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -132,8 +132,8 @@ action_mail_download_cb (GtkAction *action,
 }
 
 static void
-action_mail_empty_trash_cb (GtkAction *action,
-                            EMailShellView *mail_shell_view)
+action_mail_empty_trashes_cb (GtkAction *action,
+                              EMailShellView *mail_shell_view)
 {
 	EShellWindow *shell_window;
 	EShellView *shell_view;
@@ -938,14 +938,14 @@ static GtkActionEntry mail_entries[] = {
 	  N_("Empty _Trash"),
 	  NULL,
 	  N_("Permanently remove all the deleted messages from all folders"),
-	  G_CALLBACK (action_mail_empty_trash_cb) },
+	  G_CALLBACK (action_mail_empty_trashes_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) },
+	  G_CALLBACK (action_mail_folder_expunge_cb) },
 
 	{ "mail-flush-outbox",
 	  "mail-send",