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

The following commit has been merged in the master branch:
commit ec564500544b297b4ac05ef57755d336b009d7bc
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu May 16 14:25:16 2013 +0200

    Show status message in user's status change notifications
    
    BUG: 319777
    FIXED-IN: 0.7.0
    Reviewed-By: David Edmundson
---
 lib/chat-widget.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 81f89ab..39da92c 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -718,7 +718,14 @@ void ChatWidget::onContactPresenceChange(const Tp::ContactPtr & contact, const K
     bool isYou = (contact == d->channel->groupSelfContact());
 
     if (isYou) {
-        message = i18n("You are now marked as %1", presence.displayString());
+        if (presence.statusMessage().isEmpty()) {
+            message = i18nc("Your presence status", "You are now marked as %1",
+                            presence.displayString());
+        } else {
+            message = i18nc("Your presence status with status message",
+                            "You are now marked as %1 - %2",
+                            presence.displayString(), presence.statusMessage());
+        }
     }
     else {
         if (presence.statusMessage().isEmpty()) {

-- 
ktp-text-ui packaging