[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=8adddd9

The following commit has been merged in the master branch:
commit 8adddd9cc1d37656377ccdfd468d418aaad221d9
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Mar 5 01:03:19 2013 +0000

    Guard against invalid account/contact
---
 contact-list-widget.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 7ea99a0..763374a 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -605,11 +605,13 @@ void ContactListWidget::mouseMoveEvent(QMouseEvent *event)
         Tp::ContactPtr contact = index.data(KTp::ContactRole).value<KTp::ContactPtr>();
         Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
 
-        //We put a contact ID and its account ID to the stream, so we can later recreate the contact using ContactsModel
-        stream << contact->id() << account->objectPath();
+        if (account && contact) {
+            //We put a contact ID and its account ID to the stream, so we can later recreate the contact using ContactsModel
+            stream << contact->id() << account->objectPath();
 
-        //Store source group name so that we can remove the contact from it on move-drop */
-        d->dragSourceGroup = index.parent().data(KTp::IdRole).toString();
+            //Store source group name so that we can remove the contact from it on move-drop */
+            d->dragSourceGroup = index.parent().data(KTp::IdRole).toString();
+        }
     }
 
     mimeData->setData("application/vnd.telepathy.contact", encodedData);

-- 
ktp-contact-list packaging