[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=45e7e54

The following commit has been merged in the master branch:
commit 45e7e542d33eb04b56e3bd78a16850899f342731
Author: Weng Xuetian <wengxt at gmail.com>
Date:   Thu Sep 12 15:38:21 2013 -0400

    Only set presence on user action
    
    presence should only send to telepathy if this is a user change,
    otherwise there might be a data race and might cause unexpected
    presence change.
    
    REVIEW: 112705
---
 global-presence-chooser.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 55a30b9..ccf026b 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -361,6 +361,9 @@ void GlobalPresenceChooser::onUserActivatedComboChange(int index)
                                                           QLatin1String( "org.kde.Telepathy"),
                                                           QLatin1String("deactivateNowPlaying"));
         QDBusConnection::sessionBus().send(message);
+        // only set global presence on user change
+        KTp::Presence presence = itemData(index, PresenceModel::PresenceRole).value<KTp::Presence>();
+        m_globalPresence->setPresence(presence);
     }
 }
 
@@ -369,7 +372,6 @@ void GlobalPresenceChooser::onAllComboChanges(int index)
     int lastPresenceIndex = m_model->rowCount();
     if(index < lastPresenceIndex) {
         KTp::Presence presence = itemData(index, PresenceModel::PresenceRole).value<KTp::Presence>();
-        m_globalPresence->setPresence(presence);
         if ((presence.type() == Tp::ConnectionPresenceTypeOffline) ||
            (presence.type() == Tp::ConnectionPresenceTypeHidden)) {
             m_changePresenceMessageButton->hide();

-- 
ktp-contact-list packaging