From 7a5c48e7f70b8bc938fcae3ffd2be0fdbeaab145 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 13 Dec 2006 02:17:24 -0500
Subject: [PATCH] Changed 'junk' label in French localization

---
 program/steps/mail/folders.inc |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index e1730ef..2d16032 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -16,22 +16,21 @@
  +-----------------------------------------------------------------------+
 
  $Id$
-
 */
 
 $REMOTE_REQUEST = TRUE;
-$mbox = $IMAP->get_mailbox_name();
+$mbox_name = $IMAP->get_mailbox_name();
 
 
 // send EXPUNGE command
 if ($_action=='expunge')
   {
-  $success = $IMAP->expunge();
+  $success = $IMAP->expunge($_GET['_mbox']);
 
   // reload message list if current mailbox  
   if ($success && $_GET['_reload'])
     {
-    rcube_remote_response('this.clear_message_list();', TRUE);
+    rcube_remote_response('this.message_list.clear();', TRUE);
     $_action = 'list';
     return;
     }
@@ -42,14 +41,15 @@
 // clear mailbox
 else if ($_action=='purge')
   {
-  $success = $IMAP->clear_mailbox();
+  $success = $IMAP->clear_mailbox($_GET['_mbox']);
   
   if ($success && $_GET['_reload'])
     {
-    $commands = "this.set_env('messagecount', 0);\n";
+    $commands = "this.message_list.clear();\n";
+    $commands .= "this.set_env('messagecount', 0);\n";
     $commands .= "this.set_env('pagecount', 0);\n";
     $commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
-    $commands .= sprintf("this.set_unread_count('%s', 0);\n", addslashes($mbox));
+    $commands .= sprintf("this.set_unread_count('%s', 0);\n", addslashes($mbox_name));
     }
   else
     $commands = "// purged: $success";

--
Gitblit v1.9.1