[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=17670fc

The following commit has been merged in the master branch:
commit 17670fca2543ea837de7dd1d06da87c928d4382d
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 29 22:42:46 2009 +0000

    Show the icons for the protocols in the Add Account Assistant's first page. The icon names follow the same naming scheme as Empathy. We'll need to get them moved out of Kopete's protocol folders at some point so that they can be installed accessible for all Telepathy enabled apps.
    
    BUG: 201398
    
    Thanks to Lorenzo Masini for the patch.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1004366
---
 src/protocol-list-model.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/protocol-list-model.cpp b/src/protocol-list-model.cpp
index 28d5ec6..ad23a07 100644
--- a/src/protocol-list-model.cpp
+++ b/src/protocol-list-model.cpp
@@ -23,6 +23,7 @@
 #include "connection-manager-item.h"
 #include "protocol-item.h"
 
+#include <KIcon>
 #include <KDebug>
 
 ProtocolListModel::ProtocolListModel(QObject *parent)
@@ -64,6 +65,10 @@ QVariant ProtocolListModel::data(const QModelIndex &index, int role) const
     case Qt::DisplayRole:
         data = QVariant(m_protocolItems.at(index.row())->protocol());
         break;
+    case Qt::DecorationRole:
+        // Look for an icon named im-<protocolname>
+        data = QVariant(KIcon((QString("im-%1").arg(m_protocolItems.at(index.row())->protocol()))));
+        break;
     default:
         break;
     }

-- 
ktp-accounts-kcm packaging