[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=65824d9

The following commit has been merged in the master branch:
commit 65824d9e0541e29ba33dbbf8124a83fe052ac97c
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun Jul 1 17:31:01 2012 +0300

    Update to the most recent debug interface bindings and ktp naming policy
---
 tools/debugger/CMakeLists.txt           | 10 +++++-----
 tools/debugger/debug-messages-model.cpp | 16 +++++++++++++++-
 tools/debugger/debug-messages-model.h   |  1 +
 tools/debugger/main.cpp                 |  5 ++---
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/tools/debugger/CMakeLists.txt b/tools/debugger/CMakeLists.txt
index 599de1a..02d88ec 100644
--- a/tools/debugger/CMakeLists.txt
+++ b/tools/debugger/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(telepathy-kde-debugger)
+project(ktp-debugger)
 
 find_package(TelepathyQt4 REQUIRED)
 find_package(KDE4 REQUIRED)
@@ -9,12 +9,12 @@ include_directories(
     ${KDE4_INCLUDES}
 )
 
-set(tp-kde-debugger_SRCS
+set(ktp-debugger_SRCS
     main-window.cpp
     debug-messages-model.cpp
     main.cpp
 )
 
-kde4_add_ui_files(tp-kde-debugger_SRCS main-window.ui)
-kde4_add_executable(telepathy-kde-debugger ${tp-kde-debugger_SRCS})
-target_link_libraries(telepathy-kde-debugger ${TELEPATHY_QT4_LIBRARIES} ${KDE4_KDEUI_LIBS})
+kde4_add_ui_files(ktp-debugger_SRCS main-window.ui)
+kde4_add_executable(ktp-debugger ${ktp-debugger_SRCS})
+target_link_libraries(ktp-debugger ${TELEPATHY_QT4_LIBRARIES} ${KDE4_KDEUI_LIBS})
diff --git a/tools/debugger/debug-messages-model.cpp b/tools/debugger/debug-messages-model.cpp
index a7ed444..22096a0 100644
--- a/tools/debugger/debug-messages-model.cpp
+++ b/tools/debugger/debug-messages-model.cpp
@@ -49,7 +49,7 @@ void DebugMessagesModel::onServiceRegistered(const QString & service)
 
     m_debugReceiver = Tp::DebugReceiver::create(service);
 
-    Tp::PendingReady *op = m_debugReceiver->becomeReady(Tp::DebugReceiver::FeatureMonitor);
+    Tp::PendingReady *op = m_debugReceiver->becomeReady();
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             SLOT(onDebugReceiverReady(Tp::PendingOperation*)));
 }
@@ -71,6 +71,20 @@ void DebugMessagesModel::onDebugReceiverReady(Tp::PendingOperation *op)
         connect(m_debugReceiver.data(), SIGNAL(newDebugMessage(Tp::DebugMessage)),
                 SLOT(onNewDebugMessage(Tp::DebugMessage)));
 
+        connect(m_debugReceiver->setMonitoringEnabled(true),
+                SIGNAL(finished(Tp::PendingOperation*)),
+                SLOT(onDebugReceiverMonitoringEnabled(Tp::PendingOperation*)));
+    }
+}
+
+void DebugMessagesModel::onDebugReceiverMonitoringEnabled(Tp::PendingOperation* op)
+{
+    if (op->isError()) {
+        kError() << "Failed to enable monitoring on the Debug object of" << m_serviceName
+                 << "Error was:" << op->errorName() << "-" << op->errorMessage();
+        m_tmpCache.clear();
+        m_debugReceiver.reset();
+    } else {
         connect(m_debugReceiver->fetchMessages(), SIGNAL(finished(Tp::PendingOperation*)),
             SLOT(onFetchMessagesFinished(Tp::PendingOperation*)));
     }
diff --git a/tools/debugger/debug-messages-model.h b/tools/debugger/debug-messages-model.h
index d76c55d..5023bed 100644
--- a/tools/debugger/debug-messages-model.h
+++ b/tools/debugger/debug-messages-model.h
@@ -44,6 +44,7 @@ private Q_SLOTS:
     void onServiceRegistered(const QString & service);
     void onServiceUnregistered(const QString & service);
     void onDebugReceiverReady(Tp::PendingOperation *op);
+    void onDebugReceiverMonitoringEnabled(Tp::PendingOperation *op);
     void onFetchMessagesFinished(Tp::PendingOperation *op);
     void onNewDebugMessage(const Tp::DebugMessage & msg);
 
diff --git a/tools/debugger/main.cpp b/tools/debugger/main.cpp
index c7e30cb..b707cac 100644
--- a/tools/debugger/main.cpp
+++ b/tools/debugger/main.cpp
@@ -25,10 +25,9 @@
 
 int main(int argc, char **argv)
 {
-    KAboutData aboutData("telepathy-kde-debugger",
-            "telepathy-debugger",
+    KAboutData aboutData("ktp-debugger", 0,
             ki18n("KDE Telepathy Debug Tool"),
-            "0.2.60",
+            "0.4.60",
             ki18n("Tool for inspecting logs of the various underlying telepathy components"),
             KAboutData::License_LGPL,
             ki18n("Copyright (C) 2011 Collabora Ltd."));

-- 
ktp-common-internals packaging