[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-nm/Plasma/5.12] libs/declarative: Fix ampersand and other characters in tooltip
From:       Jan Grulich <null () kde ! org>
Date:       2018-09-20 13:57:29
Message-ID: E1g2zST-0005PU-Ln () code ! kde ! org
[Download RAW message or body]

Git commit 9e4db88fe6010b593cbcde433044aa5b20b1de68 by Jan Grulich.
Committed on 20/09/2018 at 13:57.
Pushed by grulich into branch 'Plasma/5.12'.

Fix ampersand and other characters in tooltip

BUG:398225

M  +2    -3    libs/declarative/networkstatus.cpp

https://commits.kde.org/plasma-nm/9e4db88fe6010b593cbcde433044aa5b20b1de68

diff --git a/libs/declarative/networkstatus.cpp b/libs/declarative/networkstatus.cpp
index 75df4a77..7c884fb6 100644
--- a/libs/declarative/networkstatus.cpp
+++ b/libs/declarative/networkstatus.cpp
@@ -203,11 +203,10 @@ void NetworkStatus::changeActiveConnections()
                 }
 
                 NetworkManager::Connection::Ptr connection = active->connection();
-                const QString connectionName = connection->name().replace('&', \
"&amp;").replace('<', "&lt;").replace('>', "&gt;");  if (connecting) {
-                    status = i18n("Connecting to %1", connectionName);
+                    status = i18n("Connecting to %1", connection->name());
                 } else if (connected) {
-                    status = i18n("Connected to %1", connectionName);
+                    status = i18n("Connected to %1", connection->name());
                 }
 
                 if (!activeConnections.isEmpty()) {


[prev in list] [next in list] [prev in thread] [next in thread]