[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=6ef4197

The following commit has been merged in the master branch:
commit 6ef4197854544944d3e8d47d6652e5d828abbf57
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Jan 27 00:17:31 2012 +0100

    Allow to set overlays over presence icon
---
 KTp/presence.cpp | 27 ++++++++++++++++++++-------
 KTp/presence.h   |  2 +-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/KTp/presence.cpp b/KTp/presence.cpp
index d291a81..2762fee 100644
--- a/KTp/presence.cpp
+++ b/KTp/presence.cpp
@@ -21,6 +21,7 @@
 #include "presence.h"
 
 #include <KLocalizedString>
+#include <KIconLoader>
 
 namespace KTp
 {
@@ -35,21 +36,33 @@ Presence::Presence(const Tp::Presence &presence) :
 {
 }
 
-KIcon Presence::icon() const
+KIcon Presence::icon(QStringList overlays) const
 {
     switch (type()) {
     case Tp::ConnectionPresenceTypeAvailable:
-        return KIcon(QLatin1String("user-online"));
+        return KIcon(QLatin1String("user-online"),
+                     KIconLoader::global(),
+                     overlays);
     case Tp::ConnectionPresenceTypeBusy:
-        return KIcon(QLatin1String("user-busy"));
+        return KIcon(QLatin1String("user-busy"),
+                     KIconLoader::global(),
+                     overlays);
     case Tp::ConnectionPresenceTypeAway:
-        return KIcon(QLatin1String("user-away"));
+        return KIcon(QLatin1String("user-away"),
+                     KIconLoader::global(),
+                     overlays);
     case Tp::ConnectionPresenceTypeExtendedAway:
-        return KIcon(QLatin1String("user-away-extended"));
+        return KIcon(QLatin1String("user-away-extended"),
+                     KIconLoader::global(),
+                     overlays);
     case Tp::ConnectionPresenceTypeHidden:
-        return KIcon(QLatin1String("user-invisible"));
+        return KIcon(QLatin1String("user-invisible"),
+                     KIconLoader::global(),
+                     overlays);
     case Tp::ConnectionPresenceTypeOffline:
-        return KIcon(QLatin1String("user-offline"));
+        return KIcon(QLatin1String("user-offline"),
+                     KIconLoader::global(),
+                     overlays);
     default:
         return KIcon();
     }
diff --git a/KTp/presence.h b/KTp/presence.h
index 07f3576..93b0e30 100644
--- a/KTp/presence.h
+++ b/KTp/presence.h
@@ -35,7 +35,7 @@ class KTP_EXPORT Presence : public Tp::Presence
 public:
     Presence();
     Presence(const Tp::Presence &presence);
-    KIcon icon() const;
+    KIcon icon(QStringList overlays = QStringList()) const;
 
     /** Returns which presence is "more available" */
     bool operator <(const Presence &other) const;

-- 
ktp-common-internals packaging