[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=db71b8c

The following commit has been merged in the master branch:
commit db71b8ccc01735dcf6b3262e94c8f699ac24f5ed
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue May 13 11:08:44 2014 +0200

    Guard against null targetContact
    
    BUG: 334132
    REVIEWED-BY: Ahmed Khalil
---
 lib/chat-widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index bc876c7..a12cabf 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -176,7 +176,7 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     connect(d->shareImageMenuAction, SIGNAL(triggered(bool)), this, SLOT(onShareImageMenuActionTriggered()));
     d->fileTransferMenuAction = new QAction(KIcon::fromTheme(QLatin1String("mail-attachment")), i18n("Send File"), this);
 
-    d->fileTransferMenuAction->setEnabled(targetContact->fileTransferCapability());
+    d->fileTransferMenuAction->setEnabled(targetContact && targetContact->fileTransferCapability());
     d->fileResourceTransferMenu->addAction(d->fileTransferMenuAction);
     connect(d->fileTransferMenuAction, SIGNAL(triggered(bool)), this, SLOT(onFileTransferMenuActionTriggered()));
 

-- 
ktp-text-ui packaging