[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=6c44bd7

The following commit has been merged in the master branch:
commit 6c44bd75b7748b423495295cb7c5fe3e6a6d0684
Author: James Smith <smithjd15 at gmail.com>
Date:   Mon Aug 25 16:20:36 2014 +0200

    Show current currentPresence in tooltip rather than requested
    
    This is useful to see which accounts are actually online as the
    combobox shows requested state
    
    Reviewed-by: David Edmundson
---
 global-presence-chooser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 295b2b0..da6a87b 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -220,7 +220,7 @@ bool GlobalPresenceChooser::event(QEvent *e)
 
         Q_FOREACH(const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
             if (account->isEnabled()) {
-                KTp::Presence accountPresence(account->requestedPresence());
+                KTp::Presence accountPresence(account->currentPresence());
                 QString presenceIconPath = KIconLoader::global()->iconPath(accountPresence.icon().name(), 1);
                 QString presenceIconString = QString::fromLatin1("<img src=\"%1\">").arg(presenceIconPath);
                 QString accountIconPath = KIconLoader::global()->iconPath(account->iconName(), 1);

-- 
ktp-contact-list packaging