[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=c87be89

The following commit has been merged in the master branch:
commit c87be89df62eff2326ad5b2297f4dbe99df89a4f
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Mar 8 19:22:08 2012 +0100

    Remove all whitespace chars like 	 and 
 from the presence message
    
    Reviewed-by: Aleix Pol
    BUG: 279173
---
 contact-delegate-compact.cpp | 2 +-
 contact-delegate.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 510389d..829d713 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -120,7 +120,7 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
     painter->setPen(presenceMessagePen);
 
     painter->drawText(presenceMessageRect,
-                      nameFontMetrics.elidedText(presence.statusMessage(),
+                      nameFontMetrics.elidedText(presence.statusMessage().simplified(),
                                                  Qt::ElideRight, presenceMessageRect.width()));
 
     painter->restore();
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 84cb2c7..ac4c0c9 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -141,7 +141,7 @@ void ContactDelegate::paintContact(QPainter * painter, const QStyleOptionViewIte
 
     painter->setFont(statusFont);
     painter->drawText(statusMsgRect,
-                      statusFontMetrics.elidedText(presence.statusMessage(),
+                      statusFontMetrics.elidedText(presence.statusMessage().simplified(),
                                                    Qt::ElideRight, statusMsgRect.width()));
 
     painter->restore();

-- 
ktp-contact-list packaging