[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=3031c20

The following commit has been merged in the master branch:
commit 3031c20894c52f1586e435cd561c4264d695a83a
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sun Apr 14 07:53:12 2013 +0200

    Loose the word "tube" in notification; simplify logic
    
    The two previously handled cases - no services found and no service
    found for the particular tube are actually the same, so this unifies
    them into one case with one notification.
    
    Breaks string freeze.
    
    REVIEW: 110004
    CCMAIL: kde-i18n-doc at kde.org
---
 src/tubechannelapprover.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/tubechannelapprover.cpp b/src/tubechannelapprover.cpp
index cc651e0..83978c3 100644
--- a/src/tubechannelapprover.cpp
+++ b/src/tubechannelapprover.cpp
@@ -55,25 +55,25 @@ TubeChannelApprover::TubeChannelApprover(const Tp::TubeChannelPtr& channel, QObj
 
     KService::List services = KServiceTypeTrader::self()->query(QLatin1String("KTpApprover"));
     kDebug() << "Found" << services.count() << "KTpApprover services";
-    if (services.isEmpty()) {
-        showNotification(i18n("Unknown Incoming Tube"), i18n("Incoming tube from %1 of an unknown type"),
-                         QLatin1String("dialog-warning"), channel->initiatorContact());
-        return;
-    }
-
-    Q_FOREACH(const KService::Ptr &service, services) {
-        if ((service->property(QLatin1String("X-KTp-ChannelType")) != channel->channelType()) ||
-            (service->property(QLatin1String("X-KTp-Service")) != serviceName)) {
-            continue;
+    if (!services.isEmpty()) {
+        Q_FOREACH(const KService::Ptr &service, services) {
+            if ((service->property(QLatin1String("X-KTp-ChannelType")) != channel->channelType()) ||
+                (service->property(QLatin1String("X-KTp-Service")) != serviceName)) {
+
+                continue;
+            }
+            m_service = service;
         }
-
-        m_service = service;
     }
 
+
     if (!m_service) {
         kDebug() << "No service to match" << channel->channelType() << "," << serviceName;
-        showNotification(i18n("Incoming Request"), i18n("%1 wants to start a remote service with you"),
-                         QLatin1String("dialog-warning"), channel->initiatorContact());
+        showNotification(i18n("Unknown Incoming Connection"),
+                         i18n("%1 wants to start an unknown service with you", channel->initiatorContact()->alias()),
+                         QLatin1String("dialog-warning"),
+                         channel->initiatorContact());
+
         return;
     }
 

-- 
ktp-approver packaging