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

The following commit has been merged in the master branch:
commit f54fe2e4b256a3adbad48465d57636e65cf50c6b
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sun Oct 30 13:17:18 2011 +0100

    Stop having two sort values for Hidden presence
---
 kpresence.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kpresence.cpp b/kpresence.cpp
index 7ae9736..032baa2 100644
--- a/kpresence.cpp
+++ b/kpresence.cpp
@@ -95,16 +95,14 @@ int KPresence::sortPriority(const Tp::ConnectionPresenceType &type)
             return 3;
         case Tp::ConnectionPresenceTypeExtendedAway:
             return 4;
-        case Tp::ConnectionPresenceTypeHidden:
-            return 5;
         //don't distinguish between the following three presences
         case Tp::ConnectionPresenceTypeError:
         case Tp::ConnectionPresenceTypeUnknown:
         case Tp::ConnectionPresenceTypeUnset:
-            return 6;
+            return 5;
         case Tp::ConnectionPresenceTypeOffline:
         default:
-            return 7;
+            return 6;
     }
 
     return -1;

-- 
ktp-common-internals packaging