[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=1bb7f6f

The following commit has been merged in the master branch:
commit 1bb7f6f72e84a827ce5c00b9148e5a929412e821
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Aug 15 11:22:46 2012 +0200

    Return default id for groups without names
    
    Reviewed-by: David Edmundson
    REVIEW: 106024
---
 KTp/Models/groups-model-item.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Models/groups-model-item.cpp b/KTp/Models/groups-model-item.cpp
index c85ffbf..d62829b 100644
--- a/KTp/Models/groups-model-item.cpp
+++ b/KTp/Models/groups-model-item.cpp
@@ -77,7 +77,7 @@ QVariant GroupsModelItem::data(int role) const
     case AccountsModel::ItemRole:
         return QVariant::fromValue((GroupsModelItem*)this);
     case AccountsModel::IdRole:
-        /* drop through*/
+        return mPriv->mGroupName.isEmpty() ? QLatin1String("default_group_name") : mPriv->groupName();
     case GroupsModel::GroupNameRole:
         return mPriv->mGroupName;
     default:

-- 
ktp-common-internals packaging