[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=8f2ceb8

The following commit has been merged in the master branch:
commit 8f2ceb81c1fdc8a11993175eab4c4aa6c4c48ce7
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Dec 18 12:53:43 2012 +0100

    Rename clashing role names
    
    BUG: 311865
    FIXED-IN: 0.6
---
 KTp/Models/contacts-model.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index c4aaf10..5eb37b1 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -83,10 +83,10 @@ ContactsModel::ContactsModel(QObject *parent)
     roles[AutomaticPresenceTypeRole] = "automaticPresenceType";
     roles[AutomaticPresenceStatusRole] = "automaticPresenceStatus";
     roles[AutomaticPresenceStatusMessageRole] = "automaticPresenceStatusMessage";
-    roles[CurrentPresenceRole] = "presence";
-    roles[CurrentPresenceTypeRole] = "presenceType";
-    roles[CurrentPresenceStatusRole] = "presenceStatus";
-    roles[CurrentPresenceStatusMessageRole] = "presenceStatusMessage";
+    roles[CurrentPresenceRole] = "currentPresence";
+    roles[CurrentPresenceTypeRole] = "currentPresenceType";
+    roles[CurrentPresenceStatusRole] = "currentPresenceStatus";
+    roles[CurrentPresenceStatusMessageRole] = "currentPresenceStatusMessage";
     roles[RequestedPresenceRole] = "requestedPresence";
     roles[RequestedPresenceTypeRole] = "requestedPresenceType";
     roles[RequestedPresenceStatusRole] = "requestedPresenceStatus";

-- 
ktp-common-internals packaging