[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=6559eb0

The following commit has been merged in the master branch:
commit 6559eb016b894a4ad16a30bfedcf80652bb65412
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Tue Oct 4 15:03:07 2011 +0200

    Changed accountPtr retrieval method
    
    with this i finish off the last of the bugs for 282271
    
    Reviewed by: David Edmundson
    BUG: 282271
---
 src/telepathy-contact.cpp | 20 +++-----------------
 src/telepathy-contact.h   |  4 +---
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/telepathy-contact.cpp b/src/telepathy-contact.cpp
index 883ecd7..4abbd25 100644
--- a/src/telepathy-contact.cpp
+++ b/src/telepathy-contact.cpp
@@ -66,21 +66,6 @@ TelepathyContact::~TelepathyContact()
 //     delete m_qmlObject;
 }
 
-Tp::AccountPtr TelepathyContact::accountFromUniqueId(const QString &id) const
-{
-    Tp::AccountPtr account;
-
-    if (m_accountManager) {
-        foreach (account, m_accountManager->allAccounts()) {
-            if (account->uniqueIdentifier() == id) {
-                return account;
-            }
-        }
-    }
-
-    return account;
-}
-
 void TelepathyContact::init()
 {
     Plasma::Applet::init();
@@ -129,7 +114,7 @@ void TelepathyContact::loadConfig()
     }
 
     if (!contactId.isEmpty() && !relatedAcc.isEmpty()) {
-        Tp::AccountPtr account = accountFromUniqueId(relatedAcc);
+        Tp::AccountPtr account = m_accountManager->accountForPath(relatedAcc);
         Tp::ContactPtr contact;
 
         // check on account. Shouldn't ever be invalid
@@ -183,7 +168,7 @@ void TelepathyContact::saveConfig()
     KConfigGroup group = Plasma::Applet::config();
     group.writeEntry("id", m_contact->contact()->id());
     group.writeEntry("tempAvatar", m_contact->contact()->avatarData().fileName);
-    group.writeEntry("relatedAccount", m_contact->accountId());
+    group.writeEntry("relatedAccount", m_accountPath);
     group.sync();
 
     // update contactWrapper temp id
@@ -236,6 +221,7 @@ void TelepathyContact::setContact(const Tp::ContactPtr& newContact, const Tp::Ac
     if (!m_contact->contact() || m_contact->contact()->id() != newContact->id()) {
         m_contact->setContact(newContact);
         m_contact->setAccount(relatedAccount);
+        m_accountPath = relatedAccount->objectPath();
     }
 
     saveConfig();
diff --git a/src/telepathy-contact.h b/src/telepathy-contact.h
index 5f39d19..0b18698 100644
--- a/src/telepathy-contact.h
+++ b/src/telepathy-contact.h
@@ -56,13 +56,11 @@ private slots:
     void onAccountManagerReady(Tp::PendingOperation *op);
 
 private:
-    /** retrieve accountPtr by given unique identifier */
-    Tp::AccountPtr accountFromUniqueId(const QString &id) const;
-
     void saveConfig();
     void setupAccountManager();
 
     QString m_fileToLoad;
+    QString m_accountPath;
     Plasma::DeclarativeWidget *m_declarative;
     ContactWrapper *m_contact;
     QObject *m_qmlObject;

-- 
ktp-contact-applet packaging