[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=347988c

The following commit has been merged in the master branch:
commit 347988c448dd503d7f1c813dd5b96ac293bcd20a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jun 10 21:10:32 2013 +0100

    Check upgradeContacts succeeded
    
    BUG: 319362
---
 KTp/contact-info-dialog.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/KTp/contact-info-dialog.cpp b/KTp/contact-info-dialog.cpp
index fa5ed5f..1e7087e 100644
--- a/KTp/contact-info-dialog.cpp
+++ b/KTp/contact-info-dialog.cpp
@@ -121,6 +121,10 @@ class ContactInfoDialog::Private
 void ContactInfoDialog::Private::onContactUpgraded(Tp::PendingOperation* op)
 {
     Tp::PendingContacts *contacts = qobject_cast<Tp::PendingContacts*>(op);
+    if (op->isError()) {
+        return;
+    }
+
     Q_ASSERT(contacts->contacts().count() == 1);
 
     contact = KTp::ContactPtr::qObjectCast(contacts->contacts().first());

-- 
ktp-common-internals packaging