fixed a gstep-base issue

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1490 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m b/sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
index 9615b59f7ec50f634234efe2162ef3c3335c708b..b181258739e771d9042a119e0a985569f78225a7 100644 (file)
--- a/sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
+++ b/sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
@@ -32,6 +32,7 @@
 
 // TODO: should move different implementations to different files ...
 
+
 #if NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
 
 @interface NSString(Encoding_PrivateAPI)
@@ -72,8 +73,10 @@
 
 @end /* NSString(Encoding) */
 
+
 #else /* ! NeXT_Foundation_LIBRARY */
 
+
 @implementation NSString(Encoding)
 
 #ifdef __linux__

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 38a9085e596d95e1edd99658c271beabecad647e..b27a32784b6cf0c9d45a1e5cd022cbb73fb23ebe 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,5 +1,7 @@
 2007-05-28  Helge Hess  <helge.hess@opengroupware.org>
 
+       * NGMime: fixed compilation on gnustep-base (v4.7.247)
+
        * NGMime: improved text body encoding (v4.7.246)
 
 2007-05-15  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>

diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog
index 64724089314de2db7224ea59e90bb1ce1b9233d0..8f6b30a788d558b89597c86d222f32bbc86a2f49 100644 (file)
--- a/sope-mime/NGMime/ChangeLog
+++ b/sope-mime/NGMime/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-28  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGMimeTextBodyGenerator.m: fixed compilation on gnustep-base
+
 2007-05-28  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGMimeTextBodyGenerator.m: reworked body contents encoding using the

diff --git a/sope-mime/NGMime/NGMimeTextBodyGenerator.m b/sope-mime/NGMime/NGMimeTextBodyGenerator.m
index 2369ae957ef5d5891bfcc09c8f011a0f06d2c3d7..a535dcc7c1b5f45a6a7929bec6673ae204bc3158 100644 (file)
--- a/sope-mime/NGMime/NGMimeTextBodyGenerator.m
+++ b/sope-mime/NGMime/NGMimeTextBodyGenerator.m
@@ -22,6 +22,7 @@
 
 #include "NGMimeBodyGenerator.h"
 #include "NGMimePartGenerator.h"
+#include <NGExtensions/NSString+Encoding.h>
 #include "common.h"
 
 @implementation NGMimeTextBodyGenerator
@@ -81,8 +82,13 @@
     NSStringEncoding encoding = 0;
     NSString *charset = [[_part contentType] valueOfParameter:@"charset"];
     
-    if ([charset isNotEmpty])
-      encoding = [NSString stringEncodingForEncodingNamed:charset];
+    if ([charset isNotEmpty]) {
+#if NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
+      encoding = (NSString *)[NSString stringEncodingForEncodingNamed:charset];
+#else
+      encoding = [self _encodingFromContentType:[_part contentType]];
+#endif
+    }
     
     data = [body dataUsingEncoding:
                   (encoding != 0 ? encoding : NSISOLatin1StringEncoding)];

diff --git a/sope-mime/Version b/sope-mime/Version
index 160886bc33cabd1ac468fa17a60de4b961892745..83332567afa648d6a630c4342b89ebf20a7d5436 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=7
-SUBMINOR_VERSION:=246
+SUBMINOR_VERSION:=247
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34