[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=6ad11ed

The following commit has been merged in the master branch:
commit 6ad11edff9488dc8a2098e9dd8e0923d40612a6d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Jan 5 02:08:10 2013 +0000

    Expose old GroupsModel::GroupNameRole in GroupsTreeProxyModel
---
 KTp/Models/groups-tree-proxy-model.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/KTp/Models/groups-tree-proxy-model.cpp b/KTp/Models/groups-tree-proxy-model.cpp
index c034ae0..f9305e0 100644
--- a/KTp/Models/groups-tree-proxy-model.cpp
+++ b/KTp/Models/groups-tree-proxy-model.cpp
@@ -19,6 +19,7 @@
 #include "groups-tree-proxy-model.h"
 
 #include "contacts-model.h"
+#include "groups-model.h"
 
 #include <KLocalizedString>
 
@@ -62,6 +63,12 @@ QVariant KTp::GroupsTreeProxyModel::dataForGroup(const QString &group, int role)
         } else {
             return group;
         }
+    case GroupsModel::GroupNameRole:
+        if (group == QLatin1String("_unsorted")) {
+            return QString();
+        } else {
+            return group;
+        }
     case ContactsModel::IdRole:
         return group;
     }

-- 
ktp-common-internals packaging