[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=7cc15a4

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

    Update the account nickname in Nepomuk when it changes.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=1088908
---
 kpeople/nepomuk-feeder/telepathyaccount.cpp | 15 +++++++++++----
 kpeople/nepomuk-feeder/telepathyaccount.h   |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/kpeople/nepomuk-feeder/telepathyaccount.cpp b/kpeople/nepomuk-feeder/telepathyaccount.cpp
index 9557974..59f6808 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -60,13 +60,13 @@ TelepathyAccount::TelepathyAccount(const QString &path, TelepathyAccountMonitor
     connect(m_account.data(),
             SIGNAL(haveConnectionChanged(bool)),
             SLOT(onHaveConnectionChanged(bool)));
+    connect(m_account.data(),
+            SIGNAL(nicknameChanged(const QString &)),
+            SLOT(onNicknameChanged(const QString &)));
 /*
     connect(m_account.data(),
             SIGNAL(currentPresenceChanged(Tp::SimplePresence)),
             SLOT(onCurrentPresenceChanged(Tp::SimplePresence)));
-    connect(m_account.data(),
-            SIGNAL(displayNameChanged(QString)),
-            SLOT(onDisplayNameChanged(QString)));
             // ...... and any other properties we want to sync...
 */
 }
@@ -148,7 +148,7 @@ void TelepathyAccount::doNepomukSetup()
         m_accountResource.addProperty(Nepomuk::Vocabulary::NCO::imID(),
                                       m_account->parameters().value("account").toString());
         m_accountResource.addProperty(Nepomuk::Vocabulary::NCO::imNickname(),
-                                      m_account->displayName());
+                                      m_account->nickname());
         m_accountResource.addProperty(Nepomuk::Vocabulary::Telepathy::accountIdentifier(),
                                       m_path);
 
@@ -197,6 +197,13 @@ void TelepathyAccount::onConnectionReady(Tp::PendingOperation *op)
     // contacts in the connection's roster.
 }
 
+void TelepathyAccount::onNicknameChanged(const QString& nickname)
+{
+    m_accountResource.setProperty(Nepomuk::Vocabulary::NCO::imNickname(),
+                                  nickname);
+}
+
+
 
 #include "telepathyaccount.moc"
 
diff --git a/kpeople/nepomuk-feeder/telepathyaccount.h b/kpeople/nepomuk-feeder/telepathyaccount.h
index 7dc5316..b1855fc 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.h
+++ b/kpeople/nepomuk-feeder/telepathyaccount.h
@@ -56,6 +56,7 @@ private Q_SLOTS:
     void onAccountReady(Tp::PendingOperation *op);
     void onHaveConnectionChanged(bool haveConnection);
     void onConnectionReady(Tp::PendingOperation *op);
+    void onNicknameChanged(const QString &nickname);
 
 private:
     Q_DISABLE_COPY(TelepathyAccount);

-- 
ktp-common-internals packaging