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

The following commit has been merged in the master branch:
commit c9fa88ab362f1fe1fa798ffb6e98f07d473d9050
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Jan 30 20:49:54 2015 +0100

    Return null pixmap if none can be loaded
    
    The default pixmap for contacts without one should really be handled by
    the UI, makes for better consistency
---
 KTp/contact.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/KTp/contact.cpp b/KTp/contact.cpp
index 6310fb3..fcde1a4 100644
--- a/KTp/contact.cpp
+++ b/KTp/contact.cpp
@@ -181,9 +181,11 @@ QPixmap KTp::Contact::avatarPixmap()
             avatar.load(file);
         }
 
-        //if neither above succeeded, we need to load the icon
+        //if neither above succeeded, return empty QPixmap,
+        //PersonsModel will return the default icon instead
         if (avatar.isNull()) {
-            avatar = KIconLoader::global()->loadIcon(QLatin1String("im-user"), KIconLoader::NoGroup, 96);
+
+            return QPixmap();
         }
 
         //if the contact is offline, gray it out

-- 
ktp-common-internals packaging