[telepathy-qt4/master] StreamedMediaChannel: Do not fail if Hold.GetHoldState fails.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Thu Aug 13 15:53:13 PDT 2009


---
 TelepathyQt4/streamed-media-channel.cpp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/TelepathyQt4/streamed-media-channel.cpp b/TelepathyQt4/streamed-media-channel.cpp
index a8b08cb..daf149d 100644
--- a/TelepathyQt4/streamed-media-channel.cpp
+++ b/TelepathyQt4/streamed-media-channel.cpp
@@ -979,9 +979,11 @@ void StreamedMediaChannel::gotLocalHoldState(QDBusPendingCallWatcher *watcher)
             " failed with " << reply.error().name() << ": " <<
             reply.error().message();
 
-        // should we fail here or just ignore?
-        mPriv->readinessHelper->setIntrospectCompleted(FeatureLocalHoldState,
-                false, reply.error());
+        debug() << "Ignoring error getting hold state and assuming we're not "
+            "on hold";
+        onLocalHoldStateChanged(mPriv->localHoldState,
+                mPriv->localHoldStateReason);
+        watcher->deleteLater();
         return;
     }
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list