[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=038fcce

The following commit has been merged in the master branch:
commit 038fccee3771db13c8d1b09c287b887c1261d861
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Feb 23 13:35:18 2012 +0100

    Prevent avatars going impossibly too big in remove dialog
    
    Reviewed-by: David Edmundson
    BUG: 292129
---
 dialogs/remove-contact-dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dialogs/remove-contact-dialog.cpp b/dialogs/remove-contact-dialog.cpp
index 3aeb043..7b5fa1f 100644
--- a/dialogs/remove-contact-dialog.cpp
+++ b/dialogs/remove-contact-dialog.cpp
@@ -46,7 +46,7 @@ RemoveContactDialog::RemoveContactDialog(Tp::ContactPtr contact, QWidget* parent
         KIcon defaultIcon("im-user");       // load KIcon with the desired pixmap
         ui->contactAvatarLabel->setPixmap(defaultIcon.pixmap(QSize(90, 90)));
     } else {
-        ui->contactAvatarLabel->setPixmap(contact->avatarData().fileName);
+        ui->contactAvatarLabel->setPixmap(QPixmap(contact->avatarData().fileName).scaled(QSize(128, 128), Qt::KeepAspectRatio));
     }
 }
 

-- 
ktp-contact-list packaging