From kde-commits  Tue Jan 13 22:25:51 2009
From: Dariusz Mikulski <dariusz.mikulski () gmail ! com>
Date: Tue, 13 Jan 2009 22:25:51 +0000
To: kde-commits
Subject: playground/base/plasma/dataengines/presence
Message-Id: <1231885551.172575.28111.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123188556318111

SVN commit 910669 by mikulski:

fix unique identifier for account

 M  +6 -13     presence.cpp  


--- trunk/playground/base/plasma/dataengines/presence/presence.cpp #910668:910669
@@ -41,12 +41,10 @@
 		// \todo: FIXME
 		kDebug() << "createAccountDataSource called";
 		kDebug() << path;
-	    Telepathy::Client::Account *account = accountFromObjectPath(path);
+	    Telepathy::Client::Account *account = accountFromPath(path);
 
 	    QString source;
-	    // \todo: FIXME
-	    // source = account.uniqueIdentifier();
-	    source = path;
+	    source = account->uniqueIdentifier();
 	    
 	    Telepathy::SimplePresence sp = account->currentPresence();
 	    QVariant vsp;
@@ -81,18 +79,13 @@
 	{
 		kDebug() << "removeAccountDataSource called";
 		kDebug() << path;
-		
-		// \todo: FIXME
-/*
+
+		Telepathy::Client::Account *account = accountFromPath(path);
 		QString identifier = account->uniqueIdentifier();
 		parent->removeSource(identifier);
-		emit parent->sourceRemoved(identifier);
-*/
-		QString identifier = path;
-		parent->removeSource(identifier);
 	}
 	
-	Telepathy::Client::Account *accountFromObjectPath(const QString &path)
+	Telepathy::Client::Account *accountFromPath(const QString &path)
 	{
 		return m_accountManager->accountForPath(path);
 	}
@@ -127,7 +120,7 @@
 PresenceEngine::~PresenceEngine()
 {
 	// \todo: FIXME. Why there is a problem?
-//	delete d->m_accountManager;
+	// delete d->m_accountManager;
 	delete d;
 }