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

The following commit has been merged in the master branch:
commit b36c5ff916d56cc9607a0e5cc24e360c0819fc0d
Author: Emil Sedgh <emilsedgh at kde.org>
Date:   Sat Jan 26 22:34:42 2013 +0330

    RTL'izing text with a <span> does not work good enough. It will not end up right-aligning the text.
    Use <div> to rtl texts again.
    Initially, a <div> was used. However, it broke Renkoo and caused unwanted newlines.
    Now we check and add the <div> only if the text is rtl.
    Matches Adium's behaviour.
---
 lib/adium-theme-view.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

-- 
ktp-text-ui packaging