From def31edd747999292ebd3773c5dc229ab3bac4c2 Mon Sep 17 00:00:00 2001 From: wolfgang Date: Wed, 8 Aug 2007 16:21:15 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1142 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ChangeLog | 8 ++++++++ UI/MailerUI/UIxMailFolderActions.m | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7acd4f5..3cb83431 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +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. + 2007-08-07 Wolfgang Sourdeau * SoObjects/Appointments/SOGoCalendarComponent.m diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index 52b9d356..b0338a36 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; -- 2.39.5