[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=d74c601

The following commit has been merged in the master branch:
commit d74c60107f95edd9b69cc0a68edaa79e7d1cce32
Author: Alin M Elena <alinm.elena at gmail.com>
Date:   Fri Mar 15 10:23:02 2013 +0000

    correctly caches avatars token to be used for offline users
    REVIEW: 109489
---
 contactnotify.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/contactnotify.cpp b/contactnotify.cpp
index 4dd3249..7b83cfd 100644
--- a/contactnotify.cpp
+++ b/contactnotify.cpp
@@ -79,17 +79,6 @@ void ContactNotify::contactPresenceChanged(const Tp::Presence &presence)
     }
 
     m_presenceHash.insert(contact->id(), Presence::sortPriority(presence.type()));
-
-    //if the contact has gone offline, check if we're not getting an empty token
-    //which would overwrite already stored token
-    if (presence.type() == Tp::ConnectionPresenceTypeOffline) {
-        if (contact->avatarToken().isEmpty() && m_avatarTokensHash.contains(contact->id())) {
-            return;
-        }
-    }
-
-    m_avatarTokensHash.insert(contact->id(), contact->avatarToken());
-    QTimer::singleShot(0, this, SLOT(saveAvatarTokens()));
 }
 
 void ContactNotify::sendNotification(const QString &text, const KIcon &icon, const Tp::ContactPtr &contact)
@@ -119,15 +108,12 @@ void ContactNotify::onContactsChanged(const Tp::Contacts &contactsAdded, const T
 
         currentPresence = contact->presence();
         m_presenceHash[contact->id()] = Presence::sortPriority(currentPresence.type());
-        m_avatarTokensHash[contact->id()] = contact->avatarToken();
 
     }
 
     Q_FOREACH(const Tp::ContactPtr &contact, contactsRemoved) {
         m_presenceHash.remove(contact->id());
     }
-
-    QTimer::singleShot(0, this, SLOT(saveAvatarTokens()));
  }
 
 void ContactNotify::saveAvatarTokens()

-- 
ktp-kded-integration-module packaging