Use the path to sendmail found in paths.h if set.

svn path=/trunk/kdenetwork/kmail/; revision=10568
wilder-work
Hans Petter Bieker 28 years ago
parent 12bcee4d22
commit 0bbb61eec4
  1. 10
      kmsender.cpp
  2. 10
      kmsettings.cpp

@ -34,6 +34,14 @@ extern KMIdentity *identity;
#include <sys/stat.h>
#include <sys/wait.h>
#ifdef HAVE_PATHS_H
#include <paths.h>
#endif
#ifndef _PATH_SENDMAIL
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
#endif
#define SENDER_GROUP "sending mail"
/** uncomment the following line for SMTP debug output */
@ -72,7 +80,7 @@ void KMSender::readConfig(void)
mSendImmediate = (bool)config->readNumEntry("Immediate", TRUE);
mSendQuotedPrintable = (bool)config->readNumEntry("Quoted-Printable", FALSE);
mMailer = config->readEntry("Mailer", "/usr/sbin/sendmail");
mMailer = config->readEntry("Mailer", _PATH_SENDMAIL);
mSmtpHost = config->readEntry("Smtp Host", "localhost");
mSmtpPort = config->readNumEntry("Smtp Port", 25);

@ -33,6 +33,14 @@
#include <qradiobt.h>
#include <qchkbox.h>
#ifdef HAVE_PATHS_H
#include <paths.h>
#endif
#ifndef _PATH_SENDMAIL
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
#endif
//------
#include "kmsettings.moc"
@ -742,7 +750,7 @@ void KMSettings::setDefaults()
{
sigEdit->setText(QString(QDir::home().path())+"/.signature");
sendmailRadio->setChecked(TRUE);
sendmailLocationEdit->setText("/usr/sbin/sendmail");
sendmailLocationEdit->setText(_PATH_SENDMAIL);
smtpRadio->setChecked(FALSE);
smtpPortEdit->setText("25");
}

Loading…
Cancel
Save