From 8c3663f6e1823ab65faa20028967c2507ec78d2c Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 28 Oct 2004 10:59:58 +0000 Subject: [PATCH] fixed a compile error git-svn-id: http://svn.opengroupware.org/SOGo/trunk@438 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/Mailer/SOGoMailManager.m | 5 ++++- SOGo/UI/Mailer/ChangeLog | 4 ++++ SOGo/UI/Mailer/UIxMailMoveToPopUp.m | 2 +- SOGo/UI/Mailer/Version | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/SOGo/SoObjects/Mailer/SOGoMailManager.m b/SOGo/SoObjects/Mailer/SOGoMailManager.m index e0660ba3..9ae1e556 100644 --- a/SOGo/SoObjects/Mailer/SOGoMailManager.m +++ b/SOGo/SoObjects/Mailer/SOGoMailManager.m @@ -249,9 +249,12 @@ static NSString *imap4Separator = nil; return nil; if ([folderName characterAtIndex:0] == '/') folderName = [folderName substringFromIndex:1]; - + if (_delfn) folderName = [folderName stringByDeletingLastPathComponent]; + if ([[self imap4Separator] isEqualToString:@"/"]) + return folderName; + names = [folderName pathComponents]; return [names componentsJoinedByString:[self imap4Separator]]; } diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog index 9094d6f1..2044075b 100644 --- a/SOGo/UI/Mailer/ChangeLog +++ b/SOGo/UI/Mailer/ChangeLog @@ -1,3 +1,7 @@ +2004-10-28 Helge Hess + + * UIxMailMoveToPopUp.m: fixed header (v0.9.54) + 2004-10-27 Helge Hess * disabled popup until it uses the proper tree (v0.9.53) diff --git a/SOGo/UI/Mailer/UIxMailMoveToPopUp.m b/SOGo/UI/Mailer/UIxMailMoveToPopUp.m index 7fef97df..ddefe1e2 100644 --- a/SOGo/UI/Mailer/UIxMailMoveToPopUp.m +++ b/SOGo/UI/Mailer/UIxMailMoveToPopUp.m @@ -22,7 +22,7 @@ #include -@class NSString; +@class NSString, NSMutableArray, NSDictionary; @interface UIxMailMoveToPopUp : WOComponent { diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version index ae9c2bde..a6a57755 100644 --- a/SOGo/UI/Mailer/Version +++ b/SOGo/UI/Mailer/Version @@ -1,6 +1,6 @@ # $Id$ -SUBMINOR_VERSION:=53 +SUBMINOR_VERSION:=54 # v0.9.50 requires NGMime v4.3.190 # v0.9.43 requires NGObjWeb v4.3.73 -- 2.39.5