[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=32713f4

The following commit has been merged in the master branch:
commit 32713f4e12bc58ad8db7b15923555e1e711d24de
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Apr 2 16:09:38 2012 +0200

    Move replacement not needed by appendScript to escapeFilter
---
 lib/adium-theme-view.cpp | 3 +--
 lib/escape-filter.cpp    | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 441e513..a97ba98 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -465,8 +465,7 @@ AdiumThemeView::AppendMode AdiumThemeView::appendMode(const AdiumThemeMessageInf
 void AdiumThemeView::appendMessage(QString &html, AppendMode mode)
 {
     QString js = appendScript(mode).arg(html.replace(QLatin1Char('\"'), QLatin1String("\\""))
-                                            .replace(QLatin1Char('
'), QLatin1String(""))
-                                            .replace(QLatin1Char('
'), QLatin1String("<br>")));
+                                            .replace(QLatin1Char('
'), QLatin1String("")));
     page()->mainFrame()->evaluateJavaScript(js);
 }
 
diff --git a/lib/escape-filter.cpp b/lib/escape-filter.cpp
index 7cb7bbe..c366410 100644
--- a/lib/escape-filter.cpp
+++ b/lib/escape-filter.cpp
@@ -31,6 +31,7 @@ void EscapeFilter::filterMessage(Message& message)
 
     escapedMessage.replace(QLatin1String("
 "), QLatin1String("<br/> ")); //keep leading whitespaces
     escapedMessage.replace(QLatin1Char('
'), QLatin1String("<br/>"));
+    escapedMessage.replace(QLatin1Char('
'), QLatin1String("<br/>"));
     escapedMessage.replace(QLatin1Char('	'), QLatin1String("    ")); // replace tabs by 4 spaces
     escapedMessage.replace(QLatin1String("  "), QLatin1String("  ")); // keep multiple whitespaces
     escapedMessage.replace(QLatin1Char('\'), QLatin1String("\\")); //replace a single backslash with two backslashes.

-- 
ktp-text-ui packaging