[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=500d6f6

The following commit has been merged in the master branch:
commit 500d6f6104e38878d114a2194f342fefb42b6aa6
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Thu Feb 11 22:32:26 2010 +0000

    Sync IMAccount properties when the account already exists in Nepomuk but the TelepathyAccount object has just been created.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=1088923
---
 kpeople/nepomuk-feeder/telepathyaccount.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kpeople/nepomuk-feeder/telepathyaccount.cpp b/kpeople/nepomuk-feeder/telepathyaccount.cpp
index 7fd7f3c..75ed257 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -134,7 +134,12 @@ void TelepathyAccount::doNepomukSetup()
                 // It matches, so set our member variable to it and stop looping.
                 m_accountResource = foundImAccount;
 
-                // TODO: Sync all the properties in case they changed behind our back on the AM.
+                // Sync any properties that have changed on the AM behind our back.
+                if (m_accountResource.property(Nepomuk::Vocabulary::NCO::imNickname()) != m_account->nickname()) {
+                    onNicknameChanged(m_account->nickname());
+                }
+                onCurrentPresenceChanged(m_account->currentPresence()); // We can always assume this one needs syncing.
+                // FIXME: Can Protocol and account properties change?
 
                 break;
         }

-- 
ktp-common-internals packaging