[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=4c4692c

The following commit has been merged in the master branch:
commit 4c4692ca02b8795f8df0522b3099d232f634a671
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Thu Apr 4 10:44:10 2013 +0200

    Restore printing tp-qt version and fix it for debug kdelibs
    
    Commit 6cbefb04441bab0d25dde78d95a2adee4d163fd5 "Prevent crashes with
    debug kdelibs" should probably have been reverting commit
    58d7eb5a461bc597455065da3a4cd813e4f0a15a "Print tp-qt library name and
    version in tp-qt debug"
    
    If the line cannot be printed, it doesn't make sense to keep the extra
    string and the extra check.
    
    Anyway the problem seem to come with a Q_ASSERT_X in kdelibs that
    searches for "(" (see kdelibs kdecore/io/kdebug.cpp.html:577)
    
    This patch restore the previous behaviour, and should fix the crash.
    
    Also add a ":" to the string, because I realized that everything that
    comes before the white space is stripped away, so now it prints
    something like "tp-qt:0.9.3.1"
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 109852
---
 KTp/debug.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/debug.cpp b/KTp/debug.cpp
index adad3fb..91c6eae 100644
--- a/KTp/debug.cpp
+++ b/KTp/debug.cpp
@@ -35,9 +35,9 @@ static void tpDebugCallback(const QString &libraryName,
                             const QString &msg)
 {
     if (Q_UNLIKELY(libraryString.isEmpty())) {
-        libraryString = QString::fromLatin1("%1 %2").arg(libraryName, libraryVersion);
+        libraryString = QString::fromLatin1("%1:%2()").arg(libraryName, libraryVersion);
     }
-    kDebugStream(type, s_tpqtDebugArea, __FILE__, __LINE__, 0) << qPrintable(msg);
+    kDebugStream(type, s_tpqtDebugArea, __FILE__, __LINE__, libraryString.toLatin1()) << qPrintable(msg);
 }
 } // namespace
 } // namespace KTp

-- 
ktp-common-internals packaging