Hello community, here is the log from the commit of package messagelib for openSUSE:Factory checked in at 2018-02-18 11:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/messagelib (Old) and /work/SRC/openSUSE:Factory/.messagelib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "messagelib" Sun Feb 18 11:40:26 2018 rev:26 rq:577499 version:17.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/messagelib/messagelib.changes 2018-02-12 10:05:36.706270463 +0100 +++ /work/SRC/openSUSE:Factory/.messagelib.new/messagelib.changes 2018-02-18 11:40:27.313712722 +0100 @@ -1,0 +2,6 @@ +Fri Feb 16 10:08:01 UTC 2018 - [email protected] + +- Add kde389592.patch to fix "Disable Emoticons" option not being + remembered (boo#1078174, kde#389592) + +------------------------------------------------------------------- New: ---- kde389592.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ messagelib.spec ++++++ --- /var/tmp/diff_new_pack.Z9w64c/_old 2018-02-18 11:40:28.449671944 +0100 +++ /var/tmp/diff_new_pack.Z9w64c/_new 2018-02-18 11:40:28.453671800 +0100 @@ -29,6 +29,8 @@ Group: System/Libraries Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: kde389592.patch BuildRequires: akonadi-contact-devel BuildRequires: akonadi-mime-devel BuildRequires: akonadi-search-devel @@ -117,6 +119,7 @@ %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build -- -DMESSAGEVIEWER_USE_QTWEBENGINE=TRUE -DQTWEBENGINE_SUPPORT_OPTION=TRUE ++++++ kde389592.patch ++++++ >From 8f34f7d882bbe21137c86a7d5d0f05d6d160d3c1 Mon Sep 17 00:00:00 2001 From: Laurent Montel <[email protected]> Date: Wed, 14 Feb 2018 08:55:25 +0100 Subject: Fix Bug 389592 - KMail2 View "disable Emoticons" option is not permanent FIXED-IN: 5.8.0 BUG: 389592 --- messageviewer/src/settings/messageviewer.kcfg.cmake | 4 ++++ messageviewer/src/viewer/viewer_p.cpp | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/messageviewer/src/settings/messageviewer.kcfg.cmake b/messageviewer/src/settings/messageviewer.kcfg.cmake index 965b03c..c18dd21 100644 --- a/messageviewer/src/settings/messageviewer.kcfg.cmake +++ b/messageviewer/src/settings/messageviewer.kcfg.cmake @@ -51,6 +51,10 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/sta <default>false</default> </entry> + <entry name="ShowEmoticons" type="Bool"> + <default>true</default> + </entry> + <entry name="AutoImportKeys" type="Bool"> <default>false</default> </entry> diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp index 1dc2403..7a79027 100644 --- a/messageviewer/src/viewer/viewer_p.cpp +++ b/messageviewer/src/viewer/viewer_p.cpp @@ -1111,6 +1111,10 @@ void ViewerPrivate::readConfig() delete mCSSHelper; mCSSHelper = new CSSHelper(mViewer); + mForceEmoticons = MessageViewer::MessageViewerSettings::self()->showEmoticons(); + if (mDisableEmoticonAction) { + mDisableEmoticonAction->setChecked(!mForceEmoticons); + } mUseFixedFont = MessageViewer::MessageViewerSettings::self()->useFixedFont(); if (mToggleFixFontAction) { mToggleFixFontAction->setChecked(mUseFixedFont); @@ -1166,6 +1170,7 @@ void ViewerPrivate::slotGeneralFontChanged() void ViewerPrivate::writeConfig(bool sync) { + MessageViewer::MessageViewerSettings::self()->setShowEmoticons(mForceEmoticons); MessageViewer::MessageViewerSettings::self()->setUseFixedFont(mUseFixedFont); if (attachmentStrategy()) { MessageViewer::MessageViewerSettings::self()->setAttachmentStrategy(QLatin1String( -- cgit v0.11.2
