[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=7c7cb30

The following commit has been merged in the master branch:
commit 7c7cb30037deaf3dc42eac2576ebc12224df68aa
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Sat Jul 5 14:42:08 2008 +0000

    Use the kopete method to choose the master presence type. (Thanks Earthwings, for the tip :) ).
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=828371
---
 presence/src/presence.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index fb92b48..9342bf0 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -265,6 +265,13 @@ void Presence::updateMasterPresence()
     int accountsExtendedAway = 0;
     int accountsHidden = 0;
     int accountsBusy = 0;
+    
+    bool okOffline = true;
+    bool okAvailable = true;
+    bool okAway = true;
+    bool okExtendedAway = true;
+    bool okHidden = true;
+    bool okBusy = true;
 
     // Iterate over all the accounts in the model, and total up how many are
     // in each type of presence state.
@@ -281,18 +288,38 @@ void Presence::updateMasterPresence()
             break;
         case QtTapioca::PresenceState::AvailableType:
             accountsAvailable++;
+            okOffline = false;
+            okHidden = false;
+            okExtendedAway = false;
+            okAway = false;
+            okBusy = false;
             break;
         case QtTapioca::PresenceState::AwayType:
             accountsAway++;
+            okOffline = false;
+            okHidden = false;
+            okExtendedAway = false;
+            okBusy = false;
             break;
         case QtTapioca::PresenceState::ExtendedAwayType:
             accountsExtendedAway++;
+            okOffline = false;
+            okHidden = false;
+            okBusy = false;
             break;
         case QtTapioca::PresenceState::HiddenType:
             accountsHidden++;
+            okOffline = false;
+            okExtendedAway = false;
+            okAway = false;
+            okBusy = false;
             break;
         case QtTapioca::PresenceState::BusyType:
             accountsBusy++;
+            okOffline = false;
+            okHidden = false;
+            okExtendedAway = false;
+            okAway = false;
             break;
         }
     }
@@ -300,10 +327,27 @@ void Presence::updateMasterPresence()
     // Chose a master presence state from this.
     // FIXME: What should be the logic for choosing a master presence state?
     //        Shoud this be user customisable?
-    if(accountsOffline >= 1)
+    //        Currently follows the kopete approach.
+    if(okOffline == true)
     {
         m_icon->setIcon(KIcon("user-offline"));
     }
+    else if(okHidden == true)
+    {
+        m_icon->setIcon(KIcon("user-invisible"));
+    }
+    else if(okBusy == true)
+    {
+        m_icon->setIcon(KIcon("user-busy"));
+    }
+    else if(okExtendedAway == true)
+    {
+        m_icon->setIcon(KIcon("user-away-extended"));
+    }
+    else if(okAway == true)
+    {
+        m_icon->setIcon(KIcon("user-away"));
+    }
     else
     {
         m_icon->setIcon(KIcon("user-online"));

-- 
ktp-contact-applet packaging