[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=70bef86

The following commit has been merged in the master branch:
commit 70bef86190f675c17a2e7d55d0ab249d44373005
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jun 23 11:45:58 2012 +1000

    Fix potential bug in hack
    
    The remove isn't in a Q_ASSERT, so now the EscapeFilter won't end
    up in the queue twice if asserts are disabled.
---
 filters/images/images-filter.cpp | 1 -
 lib/message-processor.cpp        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/filters/images/images-filter.cpp b/filters/images/images-filter.cpp
index b6c048e..442bbab 100644
--- a/filters/images/images-filter.cpp
+++ b/filters/images/images-filter.cpp
@@ -50,7 +50,6 @@ void ImagesFilter::filterMessage (Message& message)
     Q_FOREACH (QVariant var, message.property("Urls").toList()) {
         KUrl url = qvariant_cast<KUrl>(var);
         QString fileName = url.fileName();
-//         qDebug() << fileName;
 
         if (!fileName.isNull() && fileName.contains(d->imageRegex)) {
             message.appendMessagePart(
diff --git a/lib/message-processor.cpp b/lib/message-processor.cpp
index 97171ac..2a8770f 100644
--- a/lib/message-processor.cpp
+++ b/lib/message-processor.cpp
@@ -54,7 +54,7 @@ MessageProcessor::MessageProcessor()
     //FIXME: Massive hack to not escape URLs.
     Q_FOREACH (AbstractMessageFilter *filter, m_filters) {
         if (QLatin1String(filter->metaObject()->className()) == QLatin1String("EscapeFilter")) {
-            Q_ASSERT(m_filters.removeOne(filter));
+            m_filters.removeOne(filter);
             m_filters.prepend(filter);
             break;
         }

-- 
ktp-text-ui packaging