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

The following commit has been merged in the master branch:
commit c89f5c4f7d249ef43011ea5e77562c846e939b87
Author: Alex Fiestas <afiestas at kde.org>
Date:   Mon Nov 26 17:31:31 2012 +0100

    Replaces a div with span in adium style where the message is in
    
    div includes always an extra "return/space", so by using it every
    message was getting show as:
    
    foo says: blabalbalabalbalab
    				20:00:21
    
    So by replacing it with span we remove the extra return after the msg
    meaning that the result would look like:
    
    foo says: blabalbalabalbalab 	20:00:21
    
    Reviewed-by David Edmunson on irc and emilsedgh_
---
 lib/adium-theme-view.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index fec0b59..280e785 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -542,9 +542,9 @@ QString AdiumThemeView::replaceMessageKeywords(QString &htmlTemplate, const Adiu
 {
     //message
     QString message = info.message();
-    message.prepend(QString::fromLatin1("<div dir=\"%1\">").arg(info.messageDirection()));
-    message.append(QLatin1String("</div>"));
-    
+    message.prepend(QString::fromLatin1("<span dir=\"%1\">").arg(info.messageDirection()));
+    message.append(QLatin1String("</span>"));
+
     htmlTemplate.replace(QLatin1String("%message%"), message);
 
     //service

-- 
ktp-text-ui packaging