From 86648e7d24820031c58fa0db1e99a357388482c0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 8 Aug 2007 16:20:42 +0000 Subject: [PATCH] Monotone-Parent: 022519830de83b3b349d002bfd9d9b711c7d9909 Monotone-Revision: 0b420e8656035beafc355f675622d682f09c04b0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-08-08T16:20:42 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/MailerUI/UIxMailFolderActions.m | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58d97ec1c..3cb834313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-08-08 Wolfgang Sourdeau + * UI/MailerUI/UIxMailFolderActions.m ([UIxMailFolderActions + -deleteFolderAction]): fixed the url of the destination folder. + * Main/SOGo.m ([SOGo +initialize]): show the build date and hostname at startup. diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index 52b9d3563..b0338a369 100644 --- a/UI/MailerUI/UIxMailFolderActions.m +++ b/UI/MailerUI/UIxMailFolderActions.m @@ -131,16 +131,15 @@ withCO: (SOGoMailFolder *) co { NSURL *destURL; - NSString *trashFolderName, *folderName; + NSString *trashFolderName, *folderName, *path; folderName = [[srcURL path] lastPathComponent]; trashFolderName = [[co mailAccountFolder] trashFolderNameInContext: context]; - + path = [NSString stringWithFormat: @"/%@/%@", + [trashFolderName substringFromIndex: 6], folderName]; destURL = [[NSURL alloc] initWithScheme: [srcURL scheme] - host: [srcURL host] - path: [NSString stringWithFormat: @"/%@/%@", - trashFolderName, folderName]]; + host: [srcURL host] path: path]; [destURL autorelease]; return destURL;