[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmailtransport] /: Fix create mailtransport type
From: Montel Laurent <null () kde ! org>
Date: 2017-06-30 17:46:03
Message-ID: E1dQzzX-0006iY-H5 () code ! kde ! org
[Download RAW message or body]
Git commit 06f1d54844ef3d78f9b5936937e3cd52704607a8 by Montel Laurent.
Committed on 30/06/2017 at 17:45.
Pushed by mlaurent into branch 'master'.
Fix create mailtransport type
M +1 -1 CMakeLists.txt
M +0 -6 src/kmailtransport/plugins/smtp/smtpmailtransportplugin.cpp
M +0 -1 src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h
M +2 -2 src/kmailtransport/plugins/transportabstractplugin.cpp
M +1 -1 src/kmailtransport/plugins/transportabstractplugin.h
M +0 -7 src/kmailtransport/transport.cpp
M +0 -7 src/kmailtransport/transport.h
M +1 -1 src/kmailtransport/transportmanager.cpp
M +1 -1 src/kmailtransport/widgets/addtransportdialogng.cpp
M +7 -4 src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp
M +1 -1 src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h
https://commits.kde.org/kmailtransport/06f1d54844ef3d78f9b5936937e3cd52704607a8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d39f5b..d39294d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.5.65")
+set(PIM_VERSION "5.5.66")
project(MailTransport VERSION ${PIM_VERSION})
diff --git a/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.cpp \
b/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.cpp index e4d1452..910a9ed \
100644
--- a/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.cpp
+++ b/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.cpp
@@ -57,12 +57,6 @@ bool SMTPMailTransportPlugin::configureTransport(const QString \
&identifier, Mail return okClicked;
}
-void SMTPMailTransportPlugin::cleanUp(const QString &identifier)
-{
- Q_UNUSED(identifier);
- //TODO FIXME
-}
-
MailTransport::TransportJob \
*SMTPMailTransportPlugin::createTransportJob(MailTransport::Transport *t, const \
QString &identifier) {
return new MailTransport::SmtpJob(t, this);
diff --git a/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h \
b/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h index a036268..def1b38 \
100644
--- a/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h
+++ b/src/kmailtransport/plugins/smtp/smtpmailtransportplugin.h
@@ -34,7 +34,6 @@ public:
QVector<MailTransport::TransportAbstractPluginInfo> names() const override;
bool configureTransport(const QString &identifier, MailTransport::Transport \
*transport, QWidget *parent) override;
- void cleanUp(const QString &identifier) override;
MailTransport::TransportJob *createTransportJob(MailTransport::Transport *t, \
const QString &identifier) override; };
diff --git a/src/kmailtransport/plugins/transportabstractplugin.cpp \
b/src/kmailtransport/plugins/transportabstractplugin.cpp index f77c704..120c698 \
100644
--- a/src/kmailtransport/plugins/transportabstractplugin.cpp
+++ b/src/kmailtransport/plugins/transportabstractplugin.cpp
@@ -30,9 +30,9 @@ TransportAbstractPlugin::~TransportAbstractPlugin()
{
}
-void TransportAbstractPlugin::cleanUp(const QString &identifier)
+void TransportAbstractPlugin::cleanUp(MailTransport::Transport *t)
{
- Q_UNUSED(identifier);
+ Q_UNUSED(t);
}
void TransportAbstractPlugin::initializeTransport(MailTransport::Transport *t, const \
QString &identifier)
diff --git a/src/kmailtransport/plugins/transportabstractplugin.h \
b/src/kmailtransport/plugins/transportabstractplugin.h index b02b60d..c231e77 100644
--- a/src/kmailtransport/plugins/transportabstractplugin.h
+++ b/src/kmailtransport/plugins/transportabstractplugin.h
@@ -45,7 +45,7 @@ public:
virtual TransportJob *createTransportJob(MailTransport::Transport *t, const \
QString &identifier) = 0; virtual QVector<TransportAbstractPluginInfo> names() const \
= 0;
virtual bool configureTransport(const QString &identifier, Transport *transport, \
QWidget *parent) = 0;
- virtual void cleanUp(const QString &identifier);
+ virtual void cleanUp(MailTransport::Transport *t);
virtual void initializeTransport(MailTransport::Transport *t, const QString \
&identifier); };
}
diff --git a/src/kmailtransport/transport.cpp b/src/kmailtransport/transport.cpp
index 3df95e7..0271817 100644
--- a/src/kmailtransport/transport.cpp
+++ b/src/kmailtransport/transport.cpp
@@ -335,10 +335,3 @@ TransportType Transport::transportType() const
}
return d->transportType;
}
-
-void Transport::setTransportType(const TransportType &type)
-{
- Q_ASSERT(type.isValid());
- d->transportType = type;
- setIdentifier(type.identifier());
-}
diff --git a/src/kmailtransport/transport.h b/src/kmailtransport/transport.h
index 59eb44b..a2895f5 100644
--- a/src/kmailtransport/transport.h
+++ b/src/kmailtransport/transport.h
@@ -124,13 +124,6 @@ public:
*/
TransportType transportType() const;
- /**
- Sets the type of this transport.
- @see TransportType.
- @since 4.4
- */
- void setTransportType(const TransportType &type);
-
protected:
/**
Creates a Transport object. Should only be used by TransportManager.
diff --git a/src/kmailtransport/transportmanager.cpp \
b/src/kmailtransport/transportmanager.cpp index 0f783a9..033d523 100644
--- a/src/kmailtransport/transportmanager.cpp
+++ b/src/kmailtransport/transportmanager.cpp
@@ -386,7 +386,7 @@ void TransportManager::removeTransport(int id)
}
auto plugin = MailTransport::TransportPluginManager::self()->plugin(t->identifier());
if (plugin) {
- plugin->cleanUp(t->identifier());
+ plugin->cleanUp(t);
}
emit transportRemoved(t->id(), t->name());
diff --git a/src/kmailtransport/widgets/addtransportdialogng.cpp \
b/src/kmailtransport/widgets/addtransportdialogng.cpp index dfcd7cf..2d9d5e4 100644
--- a/src/kmailtransport/widgets/addtransportdialogng.cpp
+++ b/src/kmailtransport/widgets/addtransportdialogng.cpp
@@ -169,7 +169,7 @@ void AddTransportDialogNG::accept()
// Create a new transport and configure it.
Transport *transport = TransportManager::self()->createTransport();
transport->setName(d->ui.name->text().trimmed());
- //transport->setTransportType(d->selectedType());
+ transport->setIdentifier(d->selectedType());
transport->forceUniqueName();
TransportManager::self()->initializeTransport(d->selectedType(), transport);
if (TransportManager::self()->configureTransport(d->selectedType(), transport, \
this)) {
diff --git a/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp \
b/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp index \
a82920b..f7bfc54 100644
--- a/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp
+++ b/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp
@@ -39,10 +39,13 @@ AkonadiMailTransportPlugin::~AkonadiMailTransportPlugin()
{
}
-void AkonadiMailTransportPlugin::cleanUp(const QString &identifier)
+void AkonadiMailTransportPlugin::cleanUp(MailTransport::Transport *t)
{
- Q_UNUSED(identifier);
- //TODO FIXME
+ const AgentInstance instance = AgentManager::self()->instance(t->host());
+ if (!instance.isValid()) {
+ qWarning() << "Could not find resource instance for name:" << t->host();
+ }
+ AgentManager::self()->removeInstance(instance);
}
QVector<MailTransport::TransportAbstractPluginInfo> \
AkonadiMailTransportPlugin::names() const @@ -87,7 +90,7 @@ void \
AkonadiMailTransportPlugin::initializeTransport(MailTransport::Transport \
*t
qWarning() << "Failed to create agent instance of type" << identifier;
return;
}
- t->setHost( cjob->instance().identifier() );
+ t->setHost(cjob->instance().identifier());
}
#include "akonadimailtransportplugin.moc"
diff --git a/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h \
b/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h index \
7176021..e56e126 100644
--- a/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h
+++ b/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.h
@@ -35,7 +35,7 @@ public:
QVector<MailTransport::TransportAbstractPluginInfo> names() const override;
bool configureTransport(const QString &identifier, MailTransport::Transport \
*transport, QWidget *parent) override;
- void cleanUp(const QString &identifier) override;
+ void cleanUp(MailTransport::Transport *t) override;
MailTransport::TransportJob *createTransportJob(MailTransport::Transport *t, \
const QString &identifier) override;
void initializeTransport(MailTransport::Transport *t, const QString &identifier) \
override; };
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic