[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=b68526e

The following commit has been merged in the master branch:
commit b68526e4b643468c1483ddc6f946638cb7c558a1
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon May 20 10:26:19 2013 +0100

    Fix %senderPrefix% appearing in themes
    
    BUG: 316323
    FIXED-IN: 0.7.0
    REVIEW: 110539
---
 lib/adium-theme-view.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index e043ea8..d539259 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -632,6 +632,10 @@ QString AdiumThemeView::replaceContentKeywords(QString& htmlTemplate, const Adiu
     htmlTemplate.replace(QLatin1String("%senderStatusIcon%"), info.senderStatusIcon());
     //senderDisplayName
     htmlTemplate.replace(QLatin1String("%senderDisplayName%"), info.senderDisplayName());
+    //Few themes use this and it is IRC specific. It is also undocumented
+    //see https://bugs.kde.org/show_bug.cgi?id=316323 for details
+    //simply replace with an empty string
+    htmlTemplate.replace(QLatin1String("%senderPrefix%"), QString());
 
     //FIXME %textbackgroundcolor{X}%
     return replaceMessageKeywords(htmlTemplate, info);

-- 
ktp-text-ui packaging