[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=278f9f8

The following commit has been merged in the master branch:
commit 278f9f82550cf763e96585ec5aed6418f9cc760e
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Sep 30 19:46:51 2012 +0200

    Fix invoking logviewer with preselected Facebook contact
    
    BUG: 307577
    REVIEW: 106635
---
 app/chat-window.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 57cc33f..92c2741 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -503,12 +503,14 @@ void ChatWindow::onOpenLogTriggered()
     Tp::AccountPtr account = currentChatTab->account();
     Tp::ContactPtr contact = currentChatTab->textChannel()->targetContact();
 
+    /* Add "--" before the UIDs so that KCmdLineArgs in ktp-log-viewer does not try to parse
+     * UIDs starting with "-" as arguments */
     if (!contact.isNull()) {
         KToolInvocation::kdeinitExec(QLatin1String("ktp-log-viewer"),
-                                     QStringList() << account->uniqueIdentifier() << contact->id());
+                                     QStringList() << QLatin1String("--") << account->uniqueIdentifier() << contact->id());
     } else {
         KToolInvocation::kdeinitExec(QLatin1String("ktp-log-viewer"),
-                                     QStringList() << account->uniqueIdentifier() << currentChatTab->textChannel()->targetId());
+                                     QStringList() << QLatin1String("--") << account->uniqueIdentifier() << currentChatTab->textChannel()->targetId());
     }
 }
 

-- 
ktp-text-ui packaging