[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=0c49102

The following commit has been merged in the master branch:
commit 0c4910203bb2bbb0f9842285427a5eed07defc47
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Mar 25 11:06:28 2013 +0100

    Don't crash when unknown service channel is accepted
    
    When no service .desktop file is found, m_service will be null,
    so we crash when the channel is accepted.
    
    REVIEW: 109703
    BUG: 317214
    FIXED-IN: 0.6.0
---
 src/tubechannelapprover.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tubechannelapprover.cpp b/src/tubechannelapprover.cpp
index fd2ff08..cc651e0 100644
--- a/src/tubechannelapprover.cpp
+++ b/src/tubechannelapprover.cpp
@@ -136,7 +136,7 @@ void TubeChannelApprover::onChannelAccepted()
         m_notification.data()->close();
     }
 
-    if (m_service->property(QLatin1String("X-KTp-Cancellable")).toBool()) {
+    if (!m_service.isNull() && m_service->property(QLatin1String("X-KTp-Cancellable")).toBool()) {
         m_notifierItem.data()->setTitle(i18n("%1 share with %2", m_service->name(), m_channel->initiatorContact()->alias()));
         //set new menu to an entry to close the channel
         m_notifierItem.data()->contextMenu()->clear();
@@ -155,4 +155,4 @@ void TubeChannelApprover::onChannelCloseRequested()
 void TubeChannelApprover::onChannelInvalidated()
 {
     deleteLater();
-}
\ No newline at end of file
+}

-- 
ktp-approver packaging