[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=d8a4411

The following commit has been merged in the master branch:
commit d8a44114763d9c64cb4e253b5afe8cbb4df9c1d9
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed May 21 12:51:59 2014 +0200

    Add Actions::openLogViewer() overload for channels
    
    Channels are identified by string handle, so in order to be able to open
    logs for a chat room, we need to be able to pass the handle to it.
    
    REVIEW: 118223
---
 KTp/actions.cpp | 24 ++++++++++++++++++------
 KTp/actions.h   |  3 +++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/KTp/actions.cpp b/KTp/actions.cpp
index c4c6f85..55b2022 100644
--- a/KTp/actions.cpp
+++ b/KTp/actions.cpp
@@ -221,27 +221,39 @@ void Actions::openLogViewer(const Tp::AccountPtr &account,
 {
     if (account.isNull() || contact.isNull()) {
         kWarning() << "Parameters invalid";
+        return;
     }
 
-    kDebug() << "Opening logviewer for" << contact->id();
+    openLogViewer(account, contact->id());
+}
+
+void Actions::openLogViewer(const QUrl &uri)
+{
+    kDebug() << "Opening logviewer for" << uri;
 
     QStringList arguments;
-    arguments << QLatin1String("--") << account->uniqueIdentifier() << contact->id();
+    arguments << QLatin1String("--") << uri.toString();
 
-    /* Use "--" so that KCmdLineArgs does not parse UIDs starting with "-" as arguments */
     KToolInvocation::kdeinitExec(QLatin1String("ktp-log-viewer"), arguments);
 }
 
-void Actions::openLogViewer(const QUrl &uri)
+void Actions::openLogViewer(const Tp::AccountPtr& account, const QString& targetId)
 {
-    kDebug() << "Opening logviewer for" << uri;
+    if (account.isNull() || targetId.isEmpty()) {
+        kWarning() << " Parameters invalid";
+        return;
+    }
+
+    kDebug() << "Opening logviewer for" << targetId;
 
     QStringList arguments;
-    arguments << QLatin1String("--") << uri.toString();
+    arguments << QLatin1String("--") << account->uniqueIdentifier() << targetId;
 
+    /* Use "--" so that KCmdLineArgs does not parse UIDs starting with "-" as arguments */
     KToolInvocation::kdeinitExec(QLatin1String("ktp-log-viewer"), arguments);
 }
 
+
 const QVariantMap createHintsForCollabRequest(const Actions::DocumentList& documents, bool needOpenEditor)
 {
     QVariantMap hints;
diff --git a/KTp/actions.h b/KTp/actions.h
index 85d43dc..35ff7a4 100644
--- a/KTp/actions.h
+++ b/KTp/actions.h
@@ -77,6 +77,9 @@ namespace Actions {
     KTP_EXPORT void openLogViewer(const Tp::AccountPtr &account,
                                   const Tp::ContactPtr &contact);
 
+    KTP_EXPORT void openLogViewer(const Tp::AccountPtr &account,
+                                  const QString &targetId);
+
     KTP_EXPORT void openLogViewer(const QUrl &uri);
 
 

-- 
ktp-common-internals packaging