[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=f85c7c6

The following commit has been merged in the master branch:
commit f85c7c618090deea4f1141ab4724998bebc40ba7
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Mon Mar 19 20:19:09 2012 +0530

    Add a icon representing the IM network along with the user name
    
    If the user has multiple accounts with the same user id on different
    networks this feature makes it easier to distinguish between 2 different
    IM networks
    
    REVIEWED BY : Martin Klapetek
---
 dialogs/add-contact-dialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dialogs/add-contact-dialog.cpp b/dialogs/add-contact-dialog.cpp
index 2b5901f..09f99f7 100644
--- a/dialogs/add-contact-dialog.cpp
+++ b/dialogs/add-contact-dialog.cpp
@@ -78,7 +78,8 @@ AddContactDialog::AddContactDialog(AccountsModel *accountModel, QWidget *parent)
     SubscribableAccountsModel *filteredModel = new SubscribableAccountsModel(this);
     filteredModel->setSourceModel(accountModel);
     for (int i = 0; i < filteredModel->rowCount(); ++i) {
-        ui->accountCombo->addItem(filteredModel->data(filteredModel->index(i, 0)).toString(),
+        ui->accountCombo->addItem(KIcon(filteredModel->data(filteredModel->index(i, 0), AccountsModel::IconRole).toString()),
+                                  filteredModel->data(filteredModel->index(i, 0)).toString(),
                                   filteredModel->data(filteredModel->index(i, 0), AccountsModel::ItemRole));
     }
 

-- 
ktp-contact-list packaging