From 92a5e0321b80d1316abf1d664ed1ad5aa9938c94 Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 27 Oct 2004 14:41:21 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOPE/trunk@319 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-mime/ChangeLog | 2 ++ sope-mime/NGMail/ChangeLog | 3 +++ sope-mime/NGMail/NGSendMail.m | 11 +++++++++-- sope-mime/Version | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog index b42dfaee..0c4a292f 100644 --- a/sope-mime/ChangeLog +++ b/sope-mime/ChangeLog @@ -1,5 +1,7 @@ 2004-10-27 Helge Hess + * 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 aa15e9b3..042d659f 100644 --- a/sope-mime/NGMail/ChangeLog +++ b/sope-mime/NGMail/ChangeLog @@ -1,5 +1,8 @@ 2004-10-27 Helge Hess + * 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 a79be08d..2ab2102c 100644 --- 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 8786e933..41ed3886 100644 --- 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 -- 2.39.5