[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=66db96a

The following commit has been merged in the master branch:
commit 66db96af7dc9108b423ecffaa1e5b8d7e4223e4f
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Nov 15 14:33:02 2011 +0100

    Use special string for xa presence (was the same as away) and display contact's presence message
    
    Reviewed-by: David Edmundson
    REVIEW: 103141
---
 lib/chat-widget.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 88738a0..2971b67 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -723,7 +723,7 @@ void ChatWidget::onContactPresenceChange(const Tp::ContactPtr & contact, const T
         if (!isYou) {
             message = i18n("%1 is offline", contact->alias());
         } else {
-            message = i18n("You are now marked as offline");
+            message = i18n("You went offline");
         }
         break;
     case Tp::ConnectionPresenceTypeAvailable:
@@ -741,18 +741,28 @@ void ChatWidget::onContactPresenceChange(const Tp::ContactPtr & contact, const T
         }
         break;
     case Tp::ConnectionPresenceTypeAway:
-    case Tp::ConnectionPresenceTypeExtendedAway:
         if (!isYou) {
             message = i18n("%1 is away", contact->alias());
         } else {
             message = i18n("You are now marked as away");
         }
         break;
+    case Tp::ConnectionPresenceTypeExtendedAway:
+        if (!isYou) {
+            message = i18n("%1 is not available", contact->alias());
+        } else {
+            message = i18n("You are now marked as not available");
+        }
+        break;
     default:
         /*Do nothing*/
         ;
     }
 
+    if (!isYou && !presence.statusMessage().isEmpty()) {
+        message = QString::fromUtf8("%1 - \"%2\"").arg(message, presence.statusMessage());
+    }
+
     if (!message.isNull()) {
         AdiumThemeStatusInfo statusMessage;
         statusMessage.setMessage(message);

-- 
ktp-text-ui packaging