[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=67d235c

The following commit has been merged in the master branch:
commit 67d235c46e492db89de25fc185201128d5be7bdc
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Jul 31 15:22:04 2012 +0200

    Set the new presence first and only then remove the temp presence
    
    Removing the temp presence first causes setting new selected index (as the currently selected one was just deleted) which is set to the next in the list, which in case of the temp presence is the 'Now playing...' one, which prompts the user for enabling it if it is disabled.
    So now we first change the presence (and current index) and only then remove the temp presence, then it won't cause another unwanted index re-setting.
    
    Reviewed-by: David Edmundson
    
    BUG: 304085
    FIXED-IN: 0.5
---
 global-presence-chooser.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 4392e2b..ec24bce 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -351,12 +351,13 @@ void GlobalPresenceChooser::onCurrentIndexChanged(int index)
 
 void GlobalPresenceChooser::onPresenceChanged(const KTp::Presence &presence)
 {
-    m_modelExtended->removeTemporaryPresence();
-    kDebug();
     for (int i=0; i < count() ; i++) {
         KTp::Presence itemPresence = itemData(i, PresenceModel::PresenceRole).value<KTp::Presence>();
         if (itemPresence.type() == presence.type() && itemPresence.statusMessage() == presence.statusMessage()) {
             setCurrentIndex(i);
+            if (itemPresence != m_modelExtended->temporaryPresence()) {
+                m_modelExtended->removeTemporaryPresence();
+            }
             return;
         }
     }

-- 
ktp-contact-list packaging