Commit 9d37b837 authored by Laurent Montel's avatar Laurent Montel
Browse files

Fix bug 460747: Kontact Crashes Upon Start

BUG: 460747
FIXED-IN: 5.22.1
parent a336d4f5
Pipeline #294682 passed with stage
in 18 minutes
......@@ -3403,6 +3403,14 @@ void KMMainWidget::setupActions()
QAction *act = actionCollection()->addAction(KStandardAction::Undo, QStringLiteral("kmail_undo"));
connect(act, &QAction::triggered, this, &KMMainWidget::slotUndo);
mAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Account &Settings"), this);
actionCollection()->addAction(QStringLiteral("resource_settings"), mAccountSettings);
connect(mAccountSettings, &QAction::triggered, this, &KMMainWidget::slotAccountSettings);
mRestartAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Restart Account"), this);
actionCollection()->addAction(QStringLiteral("resource_restart"), mRestartAccountSettings);
connect(mRestartAccountSettings, &QAction::triggered, this, &KMMainWidget::slotRestartAccount);
menutimer = new QTimer(this);
menutimer->setObjectName(QStringLiteral("menutimer"));
menutimer->setSingleShot(true);
......@@ -3535,13 +3543,6 @@ void KMMainWidget::setupActions()
actionCollection()->addAction(QStringLiteral("remove_duplicate_recursive"), mRemoveDuplicateRecursiveAction);
connect(mRemoveDuplicateRecursiveAction, &KToggleAction::triggered, this, &KMMainWidget::slotRemoveDuplicateRecursive);
mAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Account &Settings"), this);
actionCollection()->addAction(QStringLiteral("resource_settings"), mAccountSettings);
connect(mAccountSettings, &QAction::triggered, this, &KMMainWidget::slotAccountSettings);
mRestartAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Restart Account"), this);
actionCollection()->addAction(QStringLiteral("resource_restart"), mRestartAccountSettings);
connect(mRestartAccountSettings, &QAction::triggered, this, &KMMainWidget::slotRestartAccount);
{
QList<QAction *> listActions;
auto act = new QAction(i18n("Previous Selected Folder"), this); // TODO fix me i18n
......
Supports Markdown
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