[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=77aae64

The following commit has been merged in the master branch:
commit 77aae644d938d6f1bf290988bb77ea67838d3e13
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Thu Feb 11 22:00:56 2010 +0000

    Reinstate the code for getting the Tp::Connection for the account.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=1088907
---
 kpeople/nepomuk-feeder/telepathyaccount.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/kpeople/nepomuk-feeder/telepathyaccount.cpp b/kpeople/nepomuk-feeder/telepathyaccount.cpp
index ad19297..9557974 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -55,9 +55,13 @@ TelepathyAccount::TelepathyAccount(const QString &path, TelepathyAccountMonitor
     connect(m_account->becomeReady(features),
             SIGNAL(finished(Tp::PendingOperation*)),
             SLOT(onAccountReady(Tp::PendingOperation*)));
-/*
+
     // Connect to all the signals that indicate changes in properties we care about.
     connect(m_account.data(),
+            SIGNAL(haveConnectionChanged(bool)),
+            SLOT(onHaveConnectionChanged(bool)));
+/*
+    connect(m_account.data(),
             SIGNAL(currentPresenceChanged(Tp::SimplePresence)),
             SLOT(onCurrentPresenceChanged(Tp::SimplePresence)));
     connect(m_account.data(),
@@ -155,22 +159,21 @@ void TelepathyAccount::doNepomukSetup()
 
 void TelepathyAccount::onHaveConnectionChanged(bool haveConnection)
 {
-    /*
     if (haveConnection) {
         // We now have a connection to the account. Get the connection ready to use.
         if (!m_connection.isNull()) {
-            kWarning() << "Connection should be null, but is not :/";
+            kWarning() << "Connection should be null, but is not :/ Do nowt.";
             return;
         }
 
         m_connection = m_account->connection();
-        
+
         Tp::Features features;
         features << Tp::Connection::FeatureCore
                  << Tp::Connection::FeatureSimplePresence
                  << Tp::Connection::FeatureSelfContact
                  << Tp::Connection::FeatureRoster;
-        
+
         connect(m_connection->becomeReady(features),
                 SIGNAL(finished(Tp::PendingOperation*)),
                 SLOT(onConnectionReady(Tp::PendingOperation*)));
@@ -178,20 +181,20 @@ void TelepathyAccount::onHaveConnectionChanged(bool haveConnection)
         // Connection has gone down. Delete our pointer to it.
         m_connection.reset();
     }
-    */
 }
 
 void TelepathyAccount::onConnectionReady(Tp::PendingOperation *op)
 {
-    /*
     if (op->isError()) {
-        kWarning() << "Getting connection ready failed.";
+        kWarning() << "Getting connection ready failed."
+                   << op->errorName()
+                   << op->errorMessage();
         m_connection.reset();
         return;
     }
 
-    // TODO: Implement me!
-    */
+    // TODO: Create TelepathyContact objects to take care of all the
+    // contacts in the connection's roster.
 }
 
 

-- 
ktp-common-internals packaging