From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 18 Sep 2005 17:21:13 +0000 (+0000)
Subject: fixed some linking issue on OSX
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30f4f12b9d8b7df4998545b448a141092279d4f0;p=sope

fixed some linking issue on OSX


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

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 9a730f66..21fa90b1 100644
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+	* NGMime: fixed a linking issue on OSX (v4.5.236)
+
 2005-08-30  Helge Hess  <helge.hess@skyrix.com>
 
 	* do not use PCH warning flags with older compilers (v4.5.235)
diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog
index d4689064..18841bef 100644
--- a/sope-mime/NGMime/ChangeLog
+++ b/sope-mime/NGMime/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+	* NGMimeAddressHeaderFieldGenerator.m: fixed some strict dependencies
+	  on NGMail (this generator should be moved to NGMail)
+
 2005-07-20  Helge Hess  <helge.hess@opengroupware.org>
 
 	* NGMimeBodyPart.m: added some convinience methods to access the header
diff --git a/sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m b/sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
index bc9ace18..a692cf9e 100644
--- a/sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
+++ b/sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
@@ -21,10 +21,19 @@
 
 #include "NGMimeHeaderFieldGenerator.h"
 #include "NGMimeHeaderFields.h"
-#include <NGMail/NGMailAddressParser.h>
 #include <NGMime/NGMimePartParser.h>
 #include "common.h"
 
+#if MOVED_TO_NGMAIL
+#  include <NGMail/NGMailAddressParser.h>
+#else
+@interface NSObject(MailAddressParser)
++ (id)mailAddressParserWithString:(NSString *)_string;
++ (id)mailAddressParserWithData:(NSData *)_data;
+- (id)parseAddressList;
+@end
+#endif
+
 @interface NSObject(UsedProtocols)
 - (NSString *)displayName; // hh: where is that implemented ?
 @end
@@ -56,15 +65,27 @@ static int UseLFSeperatedAddressEntries = -1;
   value:(id)_value
 {
   // TODO: produces a reference to NGMailAddressParser which is in NGMail!
+#if MOVED_TO_NGMAIL
   NGMailAddressParser *parser;
+#else
+  id parser;
+#endif
   NSMutableString     *result;
   NSData              *data;
   id                  obj;
   NSEnumerator        *enumerator;
   
+#if MOVED_TO_NGMAIL
   parser = ([_value isKindOfClass:[NSString class]])
     ? [NGMailAddressParser mailAddressParserWithString:_value]
     : [NGMailAddressParser mailAddressParserWithData:_value];
+#else
+  parser = ([_value isKindOfClass:[NSString class]])
+    ? [NSClassFromString(@"NGMailAddressParser")
+			mailAddressParserWithString:_value]
+    : [NSClassFromString(@"NGMailAddressParser")
+			mailAddressParserWithData:_value];
+#endif
   
   enumerator = [[parser parseAddressList] objectEnumerator];
   result     = [[NSMutableString alloc] initWithCapacity:128];
diff --git a/sope-mime/Version b/sope-mime/Version
index 209641ab..eed402db 100644
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=235
+SUBMINOR_VERSION:=236
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34