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

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index b42dfaee03afc03a4276b6545f8c9bc7f07b656d..0c4a292f00c4104081f71560067d3b85ad005d6c 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-27  Helge Hess  <helge.hess@opengroupware.org>
 
+       * NGMail: support special sendmail location on MacOSX (v4.3.192)
+
        * NGMail: fixed a bug in NGSendMail (v4.3.191)
 
        * NGMail: added NGSendMail object (v4.3.190)

diff --git a/sope-mime/NGMail/ChangeLog b/sope-mime/NGMail/ChangeLog
index aa15e9b34026879dbfc4e64d0b809189c21695ee..042d659faf8ee9b8cc2b884ffd62f8c761b88011 100644 (file)
--- a/sope-mime/NGMail/ChangeLog
+++ b/sope-mime/NGMail/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-27  Helge Hess  <helge.hess@opengroupware.org>
 
+       * NGSendMail.m: use /usr/sbin/sendmail on Cocoa Foundation
+         (/usr/lib/sendmail on all other platforms)
+
        * NGSendMail.m: properly setup user defaults object
 
        * added new NGSendMail object (derived from mail-deliver command in

diff --git a/sope-mime/NGMail/NGSendMail.m b/sope-mime/NGMail/NGSendMail.m
index a79be08d5fd3398d66905ff6762b9ff01ecea6f0..2ab2102c7ba54a0606c0ef7c2749cc2294dc2646 100644 (file)
--- a/sope-mime/NGMail/NGSendMail.m
+++ b/sope-mime/NGMail/NGSendMail.m
@@ -48,8 +48,15 @@
     self->shouldOnlyUseMailboxName =
       [ud boolForKey:@"UseOnlyMailboxNameForSendmail"];
     
-    self->executablePath = 
-      [_path isNotNull] ? [_path copy] : @"/usr/lib/sendmail";
+    if ([_path isNotNull])
+      self->executablePath = [_path copy];
+    else {
+#if APPLE_Foundation_LIBRARY || NeXT_Foundation_LIBRARY
+      self->executablePath = @"/usr/sbin/sendmail";
+#else
+      self->executablePath = @"/usr/lib/sendmail";
+#endif
+    }
   }
   return self;
 }

diff --git a/sope-mime/Version b/sope-mime/Version
index 8786e9330896e4e3df81014ee0e4e97407d1f4d3..41ed38867195d55d80e0b3157ed728aac34d14e3 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,6 +2,6 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=3
-SUBMINOR_VERSION:=191
+SUBMINOR_VERSION:=192
 
 # v4.2.149 requires libNGStreams v4.2.34