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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/pager
From:       Martin Koller <kollix () aon ! at>
Date:       2009-08-01 18:06:29
Message-ID: 1249149989.621138.19461.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1005668 by mkoller:

escape the window title text so that HTML tags inside it are not
rendered as HTML.
(same problem as #52223)


 M  +3 -2      pager.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/pager/pager.cpp #1005667:1005668
@@ -29,6 +29,7 @@
 #include <QTimer>
 #include <QX11Info>
 #include <QDBusInterface>
+#include <QTextDocument>
 
 #include <KDialog>
 #include <KColorScheme>
@@ -1265,12 +1266,12 @@
             if ((taskCounter < 4) || active){    
                 QPixmap icon = KWindowSystem::icon(winInfo.win(), 16, 16, true);
                 if (icon.isNull()) {
-                     subtext += "<br />&bull;" + winInfo.visibleName();
+                     subtext += "<br />&bull;" + Qt::escape(winInfo.visibleName());
                 } else {
                     data.addResource(Plasma::ToolTipContent::ImageResource, \
                QUrl("wicon://" + QString::number(taskCounter)), QVariant(icon));
                     subtext += "<br /><img src=\"wicon://" + \
QString::number(taskCounter) + "\"/>";  }
-                subtext += (active ? "<u>" : "") + winInfo.visibleName() + (active ? \
"</u>" : ""); +                subtext += (active ? "<u>" : "") + \
Qt::escape(winInfo.visibleName()) + (active ? "</u>" : "");  
                 displayedTaskCounter++; 
                 windows.append(winInfo.win());


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