commit kdepim-addons for openSUSE:Factory
Hello community, here is the log from the commit of package kdepim-addons for openSUSE:Factory checked in at 2019-05-03 22:24:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-addons (Old) and /work/SRC/openSUSE:Factory/.kdepim-addons.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim-addons" Fri May 3 22:24:06 2019 rev:40 rq:699841 version:19.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-addons/kdepim-addons.changes 2019-04-26 22:48:13.113527859 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim-addons.new.5148/kdepim-addons.changes 2019-05-03 22:24:08.215933038 +0200 @@ -1,0 +2,6 @@ +Wed May 1 06:15:47 UTC 2019 - wbauer@tmo.at + +- Add Fix-bug-403317.patch to fix crashes of the mail composer when + the "Share Text" plugin is enabled (kde#403317) + +------------------------------------------------------------------- New: ---- Fix-bug-403317.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-addons.spec ++++++ --- /var/tmp/diff_new_pack.KmjXDf/_old 2019-05-03 22:24:08.851934342 +0200 +++ /var/tmp/diff_new_pack.KmjXDf/_new 2019-05-03 22:24:08.851934342 +0200 @@ -30,6 +30,8 @@ Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch0: 0001-Enable-the-expert-plugin-by-default.patch +# PATCH-FIX-UPSTREAM +Patch1: Fix-bug-403317.patch BuildRequires: akonadi-calendar-devel BuildRequires: akonadi-import-wizard-devel BuildRequires: akonadi-notes-devel ++++++ Fix-bug-403317.patch ++++++
From 32b4086c7ccfcddba01fe6d852bef8cf4fec9bff Mon Sep 17 00:00:00 2001 From: Laurent Montel <montel@kde.org> Date: Tue, 30 Apr 2019 14:00:50 +0200 Subject: Fix Bug 403317 - KMAIL2; "Share Text" plugin segfaults
BUG: 403317 --- .../sharetext/sharetextplugineditorinterface.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kmail/editorplugins/sharetext/sharetextplugineditorinterface.cpp b/kmail/editorplugins/sharetext/sharetextplugineditorinterface.cpp index d44f815..e293cad 100644 --- a/kmail/editorplugins/sharetext/sharetextplugineditorinterface.cpp +++ b/kmail/editorplugins/sharetext/sharetextplugineditorinterface.cpp @@ -40,16 +40,16 @@ ShareTextPluginEditorInterface::~ShareTextPluginEditorInterface() void ShareTextPluginEditorInterface::createAction(KActionCollection *ac) { SharetextPurposeMenuWidget *purposeMenu = new SharetextPurposeMenuWidget(parentWidget(), this); + QAction *shareAction = new QAction(i18n("Share Mail Text..."), this); + shareAction->setIcon(QIcon::fromTheme(QStringLiteral("document-share"))); + ac->addAction(QStringLiteral("share_text_menu"), shareAction); + purposeMenu->setEditorWidget(this); + MessageComposer::PluginActionType type(shareAction, MessageComposer::PluginActionType::File); + setActionType(type); if (purposeMenu->menu()) { - QAction *shareAction = new QAction(i18n("Share Mail Text..."), this); shareAction->setMenu(purposeMenu->menu()); - shareAction->setIcon(QIcon::fromTheme(QStringLiteral("document-share"))); - ac->addAction(QStringLiteral("share_text_menu"), shareAction); - purposeMenu->setEditorWidget(this); - MessageComposer::PluginActionType type(shareAction, MessageComposer::PluginActionType::File); - setActionType(type); } else { - delete purposeMenu; + shareAction->setEnabled(false); } } -- cgit v1.1
participants (1)
-
root