[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=738a458

The following commit has been merged in the master branch:
commit 738a458dce3d0811a03df4a8b11f77477dee5f2f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 4 02:09:09 2013 +0000

    Remove contact in persistent contact when connection drops
---
 KTp/persistent-contact.cpp | 7 +++++++
 KTp/persistent-contact.h   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/KTp/persistent-contact.cpp b/KTp/persistent-contact.cpp
index 84e61ea..919fad1 100644
--- a/KTp/persistent-contact.cpp
+++ b/KTp/persistent-contact.cpp
@@ -104,5 +104,12 @@ void KTp::PersistentContact::onPendingContactsFinished(Tp::PendingOperation *op)
     if (pendingContactsOp->contacts().size() == 1) {
         d->contact = KTp::ContactPtr::qObjectCast(pendingContactsOp->contacts()[0]);
         Q_EMIT contactChanged(d->contact);
+        connect(d->contact.data(), SIGNAL(invalidated()), SLOT(onContactInvalid()));
     }
 }
+
+void KTp::PersistentContact::onContactInvalid()
+{
+    d->contact = KTp::ContactPtr();
+    Q_EMIT contactChanged(d->contact);
+}
diff --git a/KTp/persistent-contact.h b/KTp/persistent-contact.h
index f288380..f5367a3 100644
--- a/KTp/persistent-contact.h
+++ b/KTp/persistent-contact.h
@@ -58,6 +58,7 @@ Q_SIGNALS:
 private Q_SLOTS:
     void onAccountConnectionChanged(const Tp::ConnectionPtr &connection);
     void onPendingContactsFinished(Tp::PendingOperation*);
+    void onContactInvalid();
 
 private:
     PersistentContact(const QString &accountId, const QString &contactId);

-- 
ktp-common-internals packaging