[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=71c322f

The following commit has been merged in the master branch:
commit 71c322f91616c03c8bfb22cdee947d3095280ab2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jun 25 22:34:57 2012 +0100

    Approve SSH Stream tubes.
    
    A status notifier icon will persist for the duration the application is running.
    
    REVIEW: 104465
---
 src/streamtubechannelapprover.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/streamtubechannelapprover.cpp b/src/streamtubechannelapprover.cpp
index 3d113f8..2a99670 100644
--- a/src/streamtubechannelapprover.cpp
+++ b/src/streamtubechannelapprover.cpp
@@ -40,7 +40,7 @@ StreamTubeChannelApprover::StreamTubeChannelApprover(
     connect(m_channel.data(), SIGNAL(invalidated(Tp::DBusProxy*,QString,QString)), SLOT(onChannelInvalidated()));
 
     if (m_channel->service() == QLatin1String("x-ssh-contact")) {
-        m_serviceName = i18n("SSH");
+        m_serviceName = i18nc("Acronym for the secure shell service","SSH");
     } else {
         m_serviceName = m_channel->service();
     }
@@ -73,7 +73,7 @@ StreamTubeChannelApprover::StreamTubeChannelApprover(
     m_notifierItem->setStatus(KStatusNotifierItem::NeedsAttention);
     m_notifierItem->setIconByName(QLatin1String("utilities-terminal"));
     m_notifierItem->setStandardActionsEnabled(false);
-    m_notifierItem->setTitle(i18n("Incoming file transfer"));
+    m_notifierItem->setTitle(i18n("Incoming share request"));
     m_notifierItem->setToolTip(QLatin1String("document-save"),
                                i18n("Incoming share request from %1", sender->alias()),
                                QString());
@@ -103,6 +103,7 @@ void StreamTubeChannelApprover::onChannelAccepted()
         m_notification.data()->close();
     }
 
+    m_notifierItem->setTitle(i18n("%1 share with %2", m_serviceName, m_channel->initiatorContact()->alias()));
     //set new menu to an entry to close the channel
     m_notifierItem->contextMenu()->clear();
     m_notifierItem->contextMenu()->addAction(KIcon("dialog-close"), i18n("Stop %1 Sharing", m_serviceName), this, SLOT(onChannelCloseRequested()));

-- 
ktp-approver packaging