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

The following commit has been merged in the master branch:
commit ec158f443af8011e4cbe72fdf95423bf8a8f498a
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Apr 1 18:03:02 2011 +0200

    Comment out setting a system avatar for the moment. Also display user's username if fullname is empty.
---
 main-widget.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index dc1adf2..e8d9258 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -64,8 +64,13 @@ MainWidget::MainWidget(QWidget *parent)
     m_filterBar->hide();
     setWindowIcon(KIcon("telepathy"));
 
-    m_userAccountIconButton->setIcon(QIcon(QPixmap::fromImage(QImage(user.faceIconPath()))));
-    m_userAccountNameLabel->setText(user.property(KUser::FullName).toString());
+//     QIcon icon;
+//     icon.addFile(user.faceIconPath());
+//     m_userAccountIconButton->setIcon(icon);
+
+    m_userAccountNameLabel->setText(user.property(KUser::FullName).isNull() ?
+        user.loginName() : user.property(KUser::FullName).toString()
+    );
 
     QToolButton *settingsButton = new QToolButton(this);
     settingsButton->setIcon(KIcon("configure"));

-- 
ktp-contact-list packaging