From d1d720b22b1c0fe666fd20b476ec7f5c6ea74260 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 1 Jun 2009 17:52:24 +0000
Subject: [PATCH] Monotone-Parent: b68886fef709d3931ecfc6a232969b39ca2576c0
 Monotone-Revision: 83dfeb0263c5486d96e98bedd1e997bf5a368823

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-01T17:52:24
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                          |  3 +++
 UI/MailerUI/UIxMailFolderActions.h |  4 ++--
 UI/MailerUI/UIxMailFolderActions.m | 10 ++++------
 UI/MailerUI/product.plist          |  2 +-
 UI/WebServerResources/MailerUI.js  |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e09b851b4..2ed755c25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailFolderActions.m (-deleteFolderAction):
+	renamed to deleteAction to match the methods in UI/Common/*Actions.m
+
 	* UI/Common/UIxFolderActions.m (-): removed useless method since
 	SOGoFolders can use the "delete" web method to achieve the same result.
 
diff --git a/UI/MailerUI/UIxMailFolderActions.h b/UI/MailerUI/UIxMailFolderActions.h
index 594bff8c9..74ea5e23b 100644
--- a/UI/MailerUI/UIxMailFolderActions.h
+++ b/UI/MailerUI/UIxMailFolderActions.h
@@ -31,8 +31,8 @@
 
 - (WOResponse *) createFolderAction;
 - (WOResponse *) renameFolderAction;
-- (WOResponse *) deleteFolderAction;
-- (WOResponse *) deleteMessagesAction;
+- (WOResponse *) deleteAction;
+- (WOResponse *) batchDeleteAction;
 - (WOResponse *) saveMessagesAction;
 - (WOResponse *) expungeAction;
 - (WOResponse *) emptyTrashAction;
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 042170fee..27a381d4a 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -153,7 +153,7 @@
   return destURL;
 }
 
-- (WOResponse *) deleteFolderAction
+- (WOResponse *) deleteAction
 {
   SOGoMailFolder *co, *inbox;
   WOResponse *response;
@@ -164,13 +164,11 @@
   co = [self clientObject];
   connection = [co imap4Connection];
   srcURL = [co imap4URL];
-  destURL = [self _trashedURLOfFolder: srcURL
-		  withCO: co];
+  destURL = [self _trashedURLOfFolder: srcURL withCO: co];
   connection = [co imap4Connection];
   inbox = [[co mailAccountFolder] inboxFolderInContext: context];
   [[connection client] select: [inbox absoluteImap4Name]];
-  error = [connection moveMailboxAtURL: srcURL
-		      toURL: destURL];
+  error = [connection moveMailboxAtURL: srcURL toURL: destURL];
   if (error)
     {
       response = [self responseWithStatus: 500];
@@ -182,7 +180,7 @@
   return response;
 }
 
-- (WOResponse *) deleteMessagesAction
+- (WOResponse *) batchDeleteAction
 {
   SOGoMailFolder *co;
   WOResponse *response;
diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index e144ea0e2..03b3c479f 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -131,7 +131,7 @@
 	  actionClass = "UIxMailFolderActions";
 	  actionName = "renameFolder";
 	};
-	deleteFolder = {
+	delete = {
 	  protectedBy = "View";
 	  actionClass = "UIxMailFolderActions";
 	  actionName = "deleteFolder";
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 2475e2191..bf9493156 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -313,7 +313,7 @@ function deleteSelectedMessages(sender) {
 			uids.push(uid);
 			paths.push(path);
     }
-		var url = ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/deleteMessages";
+		var url = ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/batchDelete";
 		var parameters = "uid=" + uids.join(",");
 		var data = { "id": uids, "mailbox": Mailer.currentMailbox, "path": paths };
 		triggerAjaxRequest(url, deleteSelectedMessagesCallback, data, parameters,