summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-30 13:42:36 +0200
committerMontel Laurent <[email protected]>2017-06-30 13:42:36 +0200
commitc011d7ae270a5c9e83fa0e36aa4c12d517b8da7b (patch)
tree8cea2f6e7e6df67f1319b0a53bc45f05520f695a
parent8c1ecba53b23eb42a574dc5eb7491300051acd46 (diff)
Adapt to new api
-rw-r--r--CMakeLists.txt2
-rw-r--r--kmailtransport/sendmail/sendmailconfigdialog.cpp3
-rw-r--r--kmailtransport/sendmail/sendmailtransportplugin.cpp11
-rw-r--r--kmailtransport/sendmail/sendmailtransportplugin.h1
4 files changed, 13 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb7a6b1..6010a43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ set(CALENDAR_UTILS_VERSION "5.5.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.5.40")
set(KIMAP_LIB_VERSION "5.5.40")
set(LIBKSIEVE_LIB_VERSION_LIB "5.5.46")
-set(KMAILTRANSPORT_LIB_VERSION "5.5.64")
+set(KMAILTRANSPORT_LIB_VERSION "5.5.65")
set(AKONADICONTACT_LIB_VERSION "5.5.43")
set(IMPORTWIZARD_LIB_VERSION "5.5.42")
set(MAILIMPORTER_LIB_VERSION "5.5.40")
diff --git a/kmailtransport/sendmail/sendmailconfigdialog.cpp b/kmailtransport/sendmail/sendmailconfigdialog.cpp
index 673290a..cfa8889 100644
--- a/kmailtransport/sendmail/sendmailconfigdialog.cpp
+++ b/kmailtransport/sendmail/sendmailconfigdialog.cpp
@@ -70,7 +70,6 @@ SendMailConfigDialog::SendMailConfigDialog(Transport *transport, QWidget *parent
: QDialog(parent)
, d(new Private(this))
{
- qDebug() << " SendMailConfigDialog::SendMailConfigDialog()" << this;
Q_ASSERT(transport);
d->transport = transport;
QVBoxLayout *mainLayout = new QVBoxLayout(this);
@@ -85,11 +84,11 @@ SendMailConfigDialog::SendMailConfigDialog(Transport *transport, QWidget *parent
connect(d->okButton, SIGNAL(clicked()), this, SLOT(okClicked()));
connect(buttonBox, &QDialogButtonBox::accepted, this, &SendMailConfigDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &SendMailConfigDialog::reject);
+ connect(d->configWidget, SIGNAL(enableButtonOk(bool)), this, SLOT(slotEnabledOkButton(bool)));
}
SendMailConfigDialog::~SendMailConfigDialog()
{
- qDebug() << " SendMailConfigDialog::~SendMailConfigDialog()" << this;
delete d;
}
diff --git a/kmailtransport/sendmail/sendmailtransportplugin.cpp b/kmailtransport/sendmail/sendmailtransportplugin.cpp
index dfcc81e..070ccab 100644
--- a/kmailtransport/sendmail/sendmailtransportplugin.cpp
+++ b/kmailtransport/sendmail/sendmailtransportplugin.cpp
@@ -19,6 +19,7 @@
#include "sendmailtransportplugin.h"
#include "sendmailconfigdialog.h"
+#include "sendmailjob.h"
#include <kpluginfactory.h>
#include <KLocalizedString>
#include <QPointer>
@@ -41,6 +42,7 @@ QVector<MailTransport::TransportAbstractPluginInfo> SendMailTransportPlugin::nam
info.name = i18nc("@option sendmail transport", "Sendmail");
info.identifier = QStringLiteral("sendmail");
info.description = i18n("A local sendmail installation");
+ info.isAkonadi = false;
return QVector<MailTransport::TransportAbstractPluginInfo>() << info;
}
@@ -58,7 +60,14 @@ bool SendMailTransportPlugin::configureTransport(const QString &identifier, Mail
void SendMailTransportPlugin::cleanUp(const QString &identifier)
{
Q_UNUSED(identifier);
- //TODO FIXME
+}
+
+MailTransport::TransportJob *SendMailTransportPlugin::createTransportJob(MailTransport::Transport *t, const QString &identifier)
+{
+ Q_UNUSED(identifier);
+ return new MailTransport::SendmailJob(t, this);
}
#include "sendmailtransportplugin.moc"
+
+
diff --git a/kmailtransport/sendmail/sendmailtransportplugin.h b/kmailtransport/sendmail/sendmailtransportplugin.h
index 2b856fe..067dd5b 100644
--- a/kmailtransport/sendmail/sendmailtransportplugin.h
+++ b/kmailtransport/sendmail/sendmailtransportplugin.h
@@ -35,6 +35,7 @@ public:
void cleanUp(const QString &identifier) override;
QVector<MailTransport::TransportAbstractPluginInfo> names() const override;
bool configureTransport(const QString &identifier, MailTransport::Transport *transport, QWidget *parent) override;
+ MailTransport::TransportJob *createTransportJob(MailTransport::Transport *t, const QString &identifier) override;
};
#endif // SendMAILTRANSPORTPLUGIN_H