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

The following commit has been merged in the master branch:
commit d778f259993c43f5dc5cb72d7357c9573e011cf9
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Dec 25 21:36:19 2011 +0000

    Add a dialog in the KCM to configure account identity
    
    Option to set account nickname and avatar
---
 KTp/Models/accounts-list-model.cpp | 4 ++++
 KTp/Models/accounts-list-model.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index 58db79e..c9691df 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -88,6 +88,10 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
         }
         break;
 
+    case AccountsListModel::ConnectionStateRole:
+        data = QVariant(m_accounts.at(index.row())->connectionStatus());
+        break;
+
     case AccountsListModel::ConnectionStateDisplayRole:
         data = QVariant(m_accounts.at(index.row())->connectionStateString());
         break;
diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index 061c192..15238b6 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -34,6 +34,7 @@ class AccountsListModel : public QAbstractListModel
 
 public:
     enum Roles {
+        ConnectionStateRole = Qt::UserRole,
         ConnectionStateDisplayRole = Qt::UserRole+1,
         ConnectionStateIconRole,
         ConnectionErrorMessageDisplayRole,

-- 
ktp-common-internals packaging