diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-06-06 21:08:40 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-06-06 22:33:15 +0200 |
commit | dee2a816907f66000aa963d3f088008ebcda6b71 (patch) | |
tree | 21c671b73b726b4f35df3f1e36052e8cef161b3e /kde-apps/kmail/files | |
parent | dev-qt/qtchooser: Drop ~arch keywords without revdeps (diff) | |
download | gentoo-dee2a816907f66000aa963d3f088008ebcda6b71.tar.gz gentoo-dee2a816907f66000aa963d3f088008ebcda6b71.tar.bz2 gentoo-dee2a816907f66000aa963d3f088008ebcda6b71.zip |
kde-apps/kmail: Fix crash on exit
See also: https://mail.kde.org/pipermail/release-team/2019-June/011386.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=404881
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/kmail/files')
-rw-r--r-- | kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch b/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch new file mode 100644 index 000000000000..5817694013a7 --- /dev/null +++ b/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch @@ -0,0 +1,74 @@ +From 97e165dcf5a851ee10526631d24f9af7736da2e6 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Thu, 6 Jun 2019 18:10:42 +0200 +Subject: Fix kontact crash on logout. + +Summary: +KMail was creating new Akonadi jobs during mainwindow destruction, +due to not testing the bool in GuiActivateEvent. + +Same bt in bug 404881, apparently quitting from the akregator tray icon +[which quits all of kontact... separate issue...] gave the same crash. + +BUG: 404881 +FIXED-IN: 19.04.2 + +Test Plan: Run kontact, logout. Hello Drkonqi. + +Reviewers: mlaurent, winterz + +Reviewed By: mlaurent, winterz + +Subscribers: kde-pim + +Tags: #kde_pim + +Differential Revision: https://phabricator.kde.org/D21626 +--- + src/kmail_part.cpp | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/src/kmail_part.cpp b/src/kmail_part.cpp +index 703a1ee..96c4c07 100644 +--- a/src/kmail_part.cpp ++++ b/src/kmail_part.cpp +@@ -33,6 +33,7 @@ + + #include <QVBoxLayout> + ++#include <KParts/GUIActivateEvent> + #include <kparts/statusbarextension.h> + #include <kparts/mainwindow.h> + #include <kpluginfactory.h> +@@ -129,18 +130,18 @@ bool KMailPart::openFile() + void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e) + { + KParts::ReadOnlyPart::guiActivateEvent(e); +- mainWidget->initializeFilterActions(); +- mainWidget->tagActionManager()->createActions(); +- mainWidget->folderShortcutActionManager()->createActions(); +- mainWidget->populateMessageListStatusFilterCombo(); +- mainWidget->initializePluginActions(); +- /* +- FIXME it doesn't work when we switch component. +- const QString title = mainWidget->fullCollectionPath(); +- if (!title.isEmpty()) { +- Q_EMIT setWindowCaption(title); ++ if (e->activated()) { ++ mainWidget->initializeFilterActions(); ++ mainWidget->tagActionManager()->createActions(); ++ mainWidget->folderShortcutActionManager()->createActions(); ++ mainWidget->populateMessageListStatusFilterCombo(); ++ mainWidget->initializePluginActions(); ++ ++ const QString title = mainWidget->fullCollectionPath(); ++ if (!title.isEmpty()) { ++ Q_EMIT setWindowCaption(title); ++ } + } +- */ + } + + void KMailPart::exit() +-- +cgit v1.1 |