[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=1039024

The following commit has been merged in the master branch:
commit 1039024e3f347bba78a8f28eebc58f2e856786ec
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Nov 26 01:24:29 2011 +0100

    Change icons when active or passive
---
 contact-request-handler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index 7c8f9a1..aecc586 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -202,6 +202,7 @@ void ContactRequestHandler::updateNotifierItemTooltip()
     if (!m_menuItems.size()) {
         // Set passive
         m_notifierItem.data()->setStatus(KStatusNotifierItem::Passive);
+        m_notifierItem.data()->setIconByName(QLatin1String("user-identity"));
         // Add the usual "nothing" action, if needed
         if (!m_notifierMenu->actions().contains(m_noContactsAction)) {
             m_notifierMenu->addAction(m_noContactsAction);
@@ -213,6 +214,7 @@ void ContactRequestHandler::updateNotifierItemTooltip()
     } else {
         // Set active
         m_notifierItem.data()->setStatus(KStatusNotifierItem::Active);
+        m_notifierItem.data()->setIconByName(QLatin1String("list-add-user"));
         // Remove the "nothing" action, if needed
         if (m_notifierMenu->actions().contains(m_noContactsAction)) {
             m_notifierMenu->removeAction(m_noContactsAction);
@@ -350,7 +352,6 @@ void ContactRequestHandler::updateMenus()
     if (m_notifierItem.isNull()) {
         m_notifierItem = new KStatusNotifierItem(QLatin1String("telepathy_kde_contact_requests"), this);
         m_notifierItem.data()->setCategory(KStatusNotifierItem::Communications);
-        m_notifierItem.data()->setStatus(KStatusNotifierItem::NeedsAttention);
         m_notifierItem.data()->setIconByName(QLatin1String("user-identity"));
         m_notifierItem.data()->setAttentionIconByName(QLatin1String("list-add-user"));
         m_notifierItem.data()->setStandardActionsEnabled(false);

-- 
ktp-kded-integration-module packaging