git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1142 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index d7acd4f587dbe92ee034186429f3e0e41b4951c4..3cb834313d36b24e3f0efe0ff72a9d69ddaf9e09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * 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  <wsourdeau@inverse.ca>
 
        * SoObjects/Appointments/SOGoCalendarComponent.m

diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 52b9d35630a886a1320da489475048fa9f67942d..b0338a369149a11d42db6e87d8c956d6ccf3ede4 100644 (file)
--- 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;