[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=8676cdc

The following commit has been merged in the master branch:
commit 8676cdc84461b568fa6f18a06abc31242ba3becd
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Mar 6 21:42:59 2013 +0000

    Review comments
---
 filters/bugzilla/bugzilla-filter.cpp                        | 13 ++++++-------
 .../ktptextui_message_filter_bugzilla.desktop.cmake         |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/filters/bugzilla/bugzilla-filter.cpp b/filters/bugzilla/bugzilla-filter.cpp
index cfa4276..9ea9a37 100644
--- a/filters/bugzilla/bugzilla-filter.cpp
+++ b/filters/bugzilla/bugzilla-filter.cpp
@@ -31,11 +31,11 @@ class BugzillaFilter::Private
 {
 public:
     Private() {
-        filterId = 0;
+        requestCounter = 0;
     }
 
     QRegExp bugText;
-    int filterId;
+    int requestCounter;
     QStringList bugzillaHosts;
 };
 
@@ -62,9 +62,10 @@ BugzillaFilter::~BugzillaFilter()
     delete d;
 }
 
-void BugzillaFilter::addBugDescription(KTp::Message &message, const KUrl &baseUrl) {
-    QString bugRequestId((QLatin1String("bug_") + QString::number(d->filterId)));
-    d->filterId++;
+void BugzillaFilter::addBugDescription(KTp::Message &message, const KUrl &baseUrl)
+{
+    QString bugRequestId((QLatin1String("bug_") + QString::number(d->requestCounter)));
+    d->requestCounter++;
 
     KUrl request;
     request.setHost(baseUrl.host());
@@ -112,8 +113,6 @@ void BugzillaFilter::filterMessage(KTp::Message &message, const KTp::MessageCont
 
         if (url.fileName() == QLatin1String("show_bug.cgi")) { //a bugzilla of some sort
 
-                        //add a check on the hostname against a whitelist.
-
             //as we have to use jsonp to get round making a cross-domain http request, a malicious website
             //could pretend to be bugzilla and return arbitrary data that we cannot sanitise, filling the text-ui
             //then someone could send a link potentially executing random JS.
diff --git a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
index 403ef20..2a25417 100644
--- a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
+++ b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
@@ -10,6 +10,6 @@ X-KDE-PluginInfo-Email=kde-telepathy at kde.org
 X-KDE-PluginInfo-Name=bugzilla
 X-KDE-PluginInfo-Version=@KTP_TEXT_UI_VERSION@
 X-KDE-PluginInfo-Website=http://community.kde.org/KTp
-X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-License=LGPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KTp-PluginInfo-Version=@KTP_MESSAGE_FILTER_FRAMEWORK_VERSION@

-- 
ktp-text-ui packaging