diff --git a/ChangeLog b/ChangeLog index 7bd0848d9..f3d2c8f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,9 @@ method that SOGo will need with non-gnustep Foundation implementation. ([NSString -stringByAppendingPathComponent:component]): new method - that SOGo will need when building with libFoundation. + that SOGo will need when building with libFoundation. Method + removed later since it is available from + Foundation/NSPathUtilities.h. * SoObjects/SOGo/SOGoUser.m ([SOGoUser -timeZone]): method moved from SOGoObject.m. diff --git a/SoObjects/SOGo/NSString+Utilities.h b/SoObjects/SOGo/NSString+Utilities.h index c6e004314..ff120c2f7 100644 --- a/SoObjects/SOGo/NSString+Utilities.h +++ b/SoObjects/SOGo/NSString+Utilities.h @@ -40,10 +40,6 @@ #ifndef GNUSTEP_BASE_LIBRARY - (BOOL) boolValue; - -#ifdef LIB_FOUNDATION_LIBRARY -- (NSString *) stringByAppendingPathComponent: (NSString *) component; -#endif #endif @end diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m index a18182bf8..66ddda632 100644 --- a/SoObjects/SOGo/NSString+Utilities.m +++ b/SoObjects/SOGo/NSString+Utilities.m @@ -107,23 +107,6 @@ return !([self isEqualToString: @"0"] || [self isEqualToString: @"NO"]); } - -#ifdef LIB_FOUNDATION_LIBRARY -- (NSString *) stringByAppendingPathComponent: (NSString *) component -{ - NSMutableArray *components; - NSString *newString; - - components = [NSMutableArray new]; - [components addObjectsFromArray: [self componentsSeparatedByString: @"/"]]; - [components addObject: component]; - newString = [components componentsJoinedByString: @"/"]; - [components release]; - - return newString; -} -#endif - #endif @end diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index 55c5af175..d18e248a1 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -23,6 +23,7 @@ #import #import #import +#import #import #import #import