[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=56275fe

The following commit has been merged in the master branch:
commit 56275fec5565233746d37d79c08f3b0c92ba265e
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sat Nov 12 21:04:07 2011 +0100

    Use KPresence::displayString() rather than another switch in presence model
    
    Reviewed-by: David Edmundson
    REVIEW: 103119
---
 presence-model.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/presence-model.cpp b/presence-model.cpp
index 555353b..2efbe12 100644
--- a/presence-model.cpp
+++ b/presence-model.cpp
@@ -59,22 +59,7 @@ QVariant PresenceModel::data(const QModelIndex &index, int role) const
     switch (role) {
     case Qt::DisplayRole:
         if (presence.statusMessage().isEmpty()) {
-            switch (presence.type()) {
-            case Tp::ConnectionPresenceTypeAvailable:
-                return i18n("Available");
-            case Tp::ConnectionPresenceTypeBusy:
-                return i18n("Busy");
-            case Tp::ConnectionPresenceTypeAway:
-                return i18n("Away");
-            case Tp::ConnectionPresenceTypeExtendedAway:
-                return i18n("Extended Away");
-            case Tp::ConnectionPresenceTypeHidden:
-                return i18n("Invisible");
-            case Tp::ConnectionPresenceTypeOffline:
-                return i18n("Offline");
-            default:
-                return i18n("Unknown");
-            }
+            return presence.displayString();
         } else {
             return presence.statusMessage();
         }

-- 
ktp-contact-list packaging