@@ -1,27 +0,0 @@
-From 7af81a3bafd595072a685301e76a3651d429b9f9 Mon Sep 17 00:00:00 2001
-From: Martin Jones <martin.jones@jollamobile.com>
-Date: Fri, 22 Apr 2016 11:40:39 +0000
-Subject: [PATCH 2/2] Remove assert which appears invalid for conference call.
- Contributes to JB#4743
-
----
- TelepathyQt/channel.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/TelepathyQt/channel.cpp b/TelepathyQt/channel.cpp
-index 2b7cde55..3a4d349a 100644
---- a/TelepathyQt/channel.cpp
-+++ b/TelepathyQt/channel.cpp
-@@ -3491,8 +3491,8 @@ void Channel::gotConferenceChannelRemovedActorContact(PendingOperation *op)
- PendingContacts *pc = qobject_cast<PendingContacts *>(op);
-
- if (pc->isValid()) {
-- Q_ASSERT(pc->contacts().size() == 1);
-- actorContact = pc->contacts().first();
-+ if (pc->contacts().size() > 0)
-+ actorContact = pc->contacts().first();
- } else {
- warning().nospace() << "Getting conference channel removed actor "
- "failed with " << pc->errorName() << ":" <<
---
-2.20.1
|