Commit 3bbd5447 authored by David Faure's avatar David Faure

KMKernel: use the global identitymanager rather than creating another one

Differential Revision: https://phabricator.kde.org/D2710
parent 3f3265e9
......@@ -128,7 +128,6 @@ static QNetworkConfigurationManager *s_networkConfigMgr = 0;
/********************************************************************/
KMKernel::KMKernel(QObject *parent) :
QObject(parent),
mIdentityManager(Q_NULLPTR),
mConfigureDialog(Q_NULLPTR),
mMailService(Q_NULLPTR),
mSystemNetworkStatus(true),
......@@ -1562,10 +1561,7 @@ void KMKernel::updateSystemTray()
KIdentityManagement::IdentityManager *KMKernel::identityManager()
{
if (!mIdentityManager) {
mIdentityManager = new KIdentityManagement::IdentityManager(false, this, "mIdentityManager");
}
return mIdentityManager;
return KIdentityManagement::IdentityManager::self();
}
KMainWindow *KMKernel::mainWin()
......
......@@ -571,7 +571,6 @@ private:
QSharedPointer<MailCommon::FolderCollection> currentFolderCollection();
UndoStack *the_undoStack;
mutable KIdentityManagement::IdentityManager *mIdentityManager;
MessageComposer::AkonadiSender *the_msgSender;
/** previous KMail version. If different from current,
the user has just updated. read from config */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment