[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=348ceea

The following commit has been merged in the master branch:
commit 348ceeae309faf2a790077db52df15b872734ddd
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Apr 9 20:53:45 2013 +0200

    Don't truncate the notification text
    
    The QML notification plasmoid now takes care of proper elipsis, so we
    don't need this anymore.
    
    Reviewed-by: David Edmundson
    FIXED-IN: 0.6.1
    BUG: 318102
---
 src/textchannelapprover.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/textchannelapprover.cpp b/src/textchannelapprover.cpp
index ea09480..f8225ef 100644
--- a/src/textchannelapprover.cpp
+++ b/src/textchannelapprover.cpp
@@ -78,15 +78,7 @@ void TextChannelApprover::onMessageReceived(const Tp::ReceivedMessage & msg)
         connect(m_notification.data(), SIGNAL(action1Activated()), SIGNAL(channelAccepted()));
     }
 
-    // Remove empty lines from message
-    QString notifyText = msg.text().simplified();
-    if (notifyText.length() > 170) {
-        //search for the closest space in text
-        QString truncatedMsg = notifyText.left(notifyText.indexOf(QLatin1Char(' '), 150)).append(QLatin1String("..."));
-        m_notification.data()->setText(truncatedMsg);
-    } else {
-        m_notification.data()->setText(notifyText);
-    }
+    m_notification.data()->setText(msg.text().simplified());
     m_notification.data()->sendEvent();
 }
 

-- 
ktp-approver packaging