[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=5ad7939

The following commit has been merged in the master branch:
commit 5ad79393c6dd21e4835458b819f6b3fb9a8b7764
Author: Moses Alexander <moijes12 at gmail.com>
Date:   Thu May 3 22:17:27 2012 +0200

    Hide the "Edit presence message" button when offline or invisible
    
    REVIEW: 104594
    BUG: 295840
---
 global-presence-chooser.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 67e2b34..bd53951 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -244,15 +244,19 @@ bool GlobalPresenceChooser::event(QEvent *e)
             }
         }
         if (ke->key() == Qt::Key_Escape) {
-            setEditable(false);
-            m_changePresenceMessageButton->show();
+            if (isEditable()) {
+                setEditable(false);
+                m_changePresenceMessageButton->show();
+            }
         }
     }
 
     if (e->type() == QEvent::FocusOut) {
         //just cancel editable and let it exec parent event()
-        setEditable(false);
-        m_changePresenceMessageButton->show();
+        if (isEditable()) {
+            setEditable(false);
+            m_changePresenceMessageButton->show();
+        }
     }
 
     return QComboBox::event(e); // krazy:exclude=qclasses
@@ -307,6 +311,12 @@ void GlobalPresenceChooser::onCurrentIndexChanged(int index)
         QDBusConnection::sessionBus().send(message);
         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();
+        } else {
+            m_changePresenceMessageButton->show();
+        }
     }
 }
 

-- 
ktp-contact-list packaging