[evolution/gnome-2-28] Bug #549988 - "Empty Trash" in Trash popup empties all Trash folders

[Milan Crha <mcrha src gnome org>]

commit a4dbd5a2251516fe1b64ff2faf9d69cfa9b018f1
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 6 13:37:25 2010 +0100

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

 mail/em-folder-tree.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index fabd89b..eb3d225 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2062,7 +2062,12 @@ emft_popup_flush_outbox (EPopup *ep, EPopupItem *pitem, gpointer data)
 static void
 emft_popup_empty_trash (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
-	em_utils_empty_trash (data);
+	EMFolderTree *emft = data;
+	CamelFolder *folder;
+
+	if ((folder = em_folder_tree_get_selected_folder (emft)) != NULL) {
+		em_utils_expunge_folder (gtk_widget_get_toplevel ((GtkWidget *)emft), folder);
+	}
 }
 
 static void