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

The following commit has been merged in the master branch:
commit bf7907d062e2de3c6faafb7dc14d21c96a6d61d1
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Oct 25 21:00:55 2012 -0700

    fix duplicate roles
---
 KTp/Models/contact-model-item.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/KTp/Models/contact-model-item.cpp b/KTp/Models/contact-model-item.cpp
index 57b37dd..e4fa8d9 100644
--- a/KTp/Models/contact-model-item.cpp
+++ b/KTp/Models/contact-model-item.cpp
@@ -157,8 +157,6 @@ QVariant ContactModelItem::data(int role) const
     case ContactsModel::SSHContactCapabilityRole:
         return sshContactCapability();
     case ContactsModel::ClientTypesRole:
-        return clientTypes();
-    case ContactsModel::ClientTypesRole:
         return mPriv->mContact->clientTypes();
     default:
         break;

-- 
ktp-common-internals packaging