[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=23e649c

The following commit has been merged in the master branch:
commit 23e649cad30c71f10c17ecd16da8444620fcf1d7
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Feb 21 12:03:30 2013 +0100

    Check the account before using it
---
 tooltips/contacttooltip.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tooltips/contacttooltip.cpp b/tooltips/contacttooltip.cpp
index 5bdab3e..01256f8 100644
--- a/tooltips/contacttooltip.cpp
+++ b/tooltips/contacttooltip.cpp
@@ -73,7 +73,9 @@ ContactToolTip::ContactToolTip(const QModelIndex &index) :
     ui->blockedLabel->setShown(index.data(KTp::ContactIsBlockedRole).toBool());
 
     const Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
-    ui->accountLabel->setText(i18n("Account: %1").arg(account->displayName()));
+    if (!account.isNull()) {
+        ui->accountLabel->setText(i18n("Account: %1").arg(account->displayName()));
+    }
 
     connect(ui->presenceMessageLabel, SIGNAL(linkActivated(QString)), this, SLOT(openLink(QString)));
 }

-- 
ktp-contact-list packaging