Wolfgang Bauer 2021-02-04 12:48:29 +00:00 committed by Git OBS Bridge
parent ac6757e00a
commit f2e98ec029
8 changed files with 77 additions and 15 deletions

View File

@ -0,0 +1,41 @@
From 893ede696038ce52f0c9ada3999b0d40bbe04692 Mon Sep 17 00:00:00 2001
From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
Date: Tue, 2 Feb 2021 12:54:16 +0000
Subject: [PATCH] Don't escape notification title text
Notifications don't support markup in title text, so escaping it causes
unintended HTML entities like &amp; to show up instead of the actual
text.
(cherry picked from commit 26a8ca7fe98ab77079f836a7fed9e888c8d046a6)
---
plugins/notifications/notification.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/plugins/notifications/notification.cpp b/plugins/notifications/notification.cpp
index e5206b9e..0baf0001 100644
--- a/plugins/notifications/notification.cpp
+++ b/plugins/notifications/notification.cpp
@@ -88,15 +88,16 @@ void Notification::createKNotification(const NetworkPacket& np)
}
QString escapedTitle = m_title.toHtmlEscaped();
+ // notification title text does not have markup, but in some cases below it is used in body text so we escape it
QString escapedText = m_text.toHtmlEscaped();
QString escapedTicker = m_ticker.toHtmlEscaped();
if (NotificationServerInfo::instance().supportedHints().testFlag(NotificationServerInfo::X_KDE_DISPLAY_APPNAME)) {
- m_notification->setTitle(escapedTitle);
+ m_notification->setTitle(m_title);
m_notification->setText(escapedText);
m_notification->setHint(QStringLiteral("x-kde-display-appname"), m_appName.toHtmlEscaped());
} else {
- m_notification->setTitle(m_appName.toHtmlEscaped());
+ m_notification->setTitle(m_appName);
if (m_title.isEmpty() && m_text.isEmpty()) {
m_notification->setText(escapedTicker);
--
2.30.0

BIN
applications.keyring Normal file

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc15b7dba854b5ccc0fbaf1f7accb2c60ef89f311925c89e0c76c5e653182160
size 549772

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwfAACgkQ29LOiT4t
HIfAHQf/SKUURcO3fRiaG1lBYXYZ0YfipLNqFoicbK5Hwcn/5CBLsKIRr/rKMNHz
Airm1IVLygTNtdmp/h6mULOpHbFiOk5vYZv3ZxTgs0mXWG8G+N/VNRmkT0uDctQj
KoTkB0tcf0pg23EcAWz2NdrTIW1rjrhF8rDXYz+Mq7J7jcI8hlgEti7X3dGNO4BD
4Jo4PFOLbCEwCyTwcExdYb0ZAt8xi7FsX137kTfa76zc0ty9eVtPSLaB8qZsLqXV
N6jV2Eaf25OEHWw7qvMZYPHVQ9HGFspDCvKKsmI0qCWHOuvLbThWqejOkhQKrwnf
Xxzc8V3e4nT/jNISfS8QqwRMA4d7uQ==
=N353
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21ca118b9ca7c6107c2cbedc95778f6f0ea03411f3b8d9f815660511ec0a9d71
size 550016

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmAYsOsACgkQu0YzUNbv
Me+ugQ//QGrJto8lBmVALH3SbGIEXCiOfSNP/0SITsJaz5dETQKluA0fC1v6G0gN
Sw8cRuHLqz55iIT0+uCjqPGjJkhnXxeJX1F0K8wJvFNmt/cYWLRgkDptH6WK4cxw
WA2SuMIj/2BYUIjQYvDFJrxTepSBWZwQX9yWo4rpiStuQxXZkXgYEnANFg5p0Apq
ptghPuXKr62yD8oJA/rc3J2RVPpvSf8RvbeP+eekyMqnIs6VfDKYfMgeJ4OXOu7m
JuUg0k9Z9mIM5bRyC6kKdWZw2gT+LuArLLGGTctlhR53TMPvBkKHOiKDYukYlLJw
CljTX5LQF/tNoUJsLUWWeQTEf4ycbzRW7Wd8Drq96hYFfQEz0ZKaAYOVyDFOIhhs
PB5YgK740WpDDWXPwuL9Nh2ukxYrVhlWEB04+mrBh2MW051/9NlQ236wm7cgGR24
1aPi4pP+GbpKR8Cu6U0j/X65UsV2tPwjhATz/eY07bN2Ms+N5q/n4tk/9S66f/ti
Un5THlY+5Z8aBd4CcG8zR2vQaB2ADFdWo723DR0L1K1TSQ090ixxAfMwSJLE3Lsi
fX6muES+quUxRdaoG0yB4YWy/5+oH0gjRSUbzi4dYzIHHbFbmLfw6FvEHbxnHLr+
aTFmq/m9shI1xBdQvLe9JQpRqz/peVTW4PaI6Ae7uA8OT06dnhA=
=EAwP
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Feb 3 08:28:23 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 20.12.2
* New bugfix release
* For more details please see:
* https://kde.org/announcements/releases/2021-02-apps-update
- Changes since 20.12.1:
* Fix notifications in the KDE Connect plasmoid (kde#432337)
* UseHighDpiPixmaps in kdeconnectd and kdeconnect-indicator
* Remove OnlyShowIn from daemon desktop file
- Add upstream patch:
* 0001-Don-t-escape-notification-title-text.patch
-------------------------------------------------------------------
Tue Jan 5 12:25:20 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>

View File

@ -20,7 +20,7 @@
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Name: kdeconnect-kde
Version: 20.12.1
Version: 20.12.2
Release: 0
Summary: Integration of Android with Linux desktops
License: GPL-2.0-or-later
@ -32,6 +32,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%
%endif
Source100: kdeconnect-kde.SuSEfirewall
Source101: kdeconnect-kde-firewalld.xml
# PATCH-FIX-UPSTREAM
Patch0: 0001-Don-t-escape-notification-title-text.patch
BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem