From 00dd948af4f6caa814395e1308a0691b4dc52dbc Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 29 Aug 2007 21:11:02 +0000 Subject: [PATCH] fixed for #1890 git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1533 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-mime/ChangeLog | 4 ++++ sope-mime/NGMime/ChangeLog | 6 ++++++ sope-mime/NGMime/NGMimeFileData.m | 13 +++++++++++-- sope-mime/Version | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog index b4915415..cbe449f2 100644 --- a/sope-mime/ChangeLog +++ b/sope-mime/ChangeLog @@ -1,3 +1,7 @@ +2007-08-29 Helge Hess + + * NGMime: some gstep-base hackaround (OGo bug #1890) (v4.7.253) + 2007-08-01 Wolfgang Sourdeau * NGImap4: fixed some gstep-base issue (OGo bug #1893) (v4.7.252) diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog index 34caa2d0..fd4bcd27 100644 --- a/sope-mime/NGMime/ChangeLog +++ b/sope-mime/NGMime/ChangeLog @@ -1,3 +1,9 @@ +2007-08-29 Helge Hess + + * NGMimeFileData.m ([NGMimeFileData -initWithBytes:length:]): do not + call [super init] on gnustep-base. This should fix (hack around) + OGo bug #1890 + 2007-06-01 Helge Hess * NGMimePartParser.m: moved processing of content-transfer-encoding diff --git a/sope-mime/NGMime/NGMimeFileData.m b/sope-mime/NGMime/NGMimeFileData.m index ffe1e4c1..0e634046 100644 --- a/sope-mime/NGMime/NGMimeFileData.m +++ b/sope-mime/NGMime/NGMimeFileData.m @@ -1,5 +1,6 @@ /* - Copyright (C) 2000-2005 SKYRIX Software AG + Copyright (C) 2000-2007 SKYRIX Software AG + Copyright (C) 2007 Helge Hess This file is part of SOPE. @@ -45,7 +46,13 @@ static unsigned tmpmask = 0600; } - (id)initWithPath:(NSString *)_path removeFile:(BOOL)_remove { - if ((self = [super init])) { +#if !GNUSTEP_BASE_LIBRARY + /* + see OGo bug #1890, the gstep-base -init clashes and we don't exactly need + it ... (but I guess its better to call it on other Foundations) + */ + if ((self = [super init]) != nil) { +#endif if (![[NSFileManager defaultManager] fileExistsAtPath:_path]) { NSLog(@"ERROR[%s]: missing file at path %@", __PRETTY_FUNCTION__, _path); [self release]; @@ -54,7 +61,9 @@ static unsigned tmpmask = 0600; self->path = [_path copy]; self->removeFile = _remove; self->length = -1; +#if !GNUSTEP_BASE_LIBRARY } +#endif return self; } diff --git a/sope-mime/Version b/sope-mime/Version index 6dc001e9..fdbbd82d 100644 --- a/sope-mime/Version +++ b/sope-mime/Version @@ -2,7 +2,7 @@ MAJOR_VERSION:=4 MINOR_VERSION:=7 -SUBMINOR_VERSION:=252 +SUBMINOR_VERSION:=253 # v4.5.214 requires libNGExtensions v4.5.146 # v4.2.149 requires libNGStreams v4.2.34 -- 2.39.5