[empathy: 9/13] empathy_tp_call_accept_incoming_call: early return if the call is not an incoming one
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 9/13] empathy_tp_call_accept_incoming_call: early return if the call is not an incoming one
- Date: Tue, 22 Jun 2010 15:27:06 +0000 (UTC)
commit b379e5e873e51d3bcad1fc055b2f7974267c7daa
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Jun 22 11:37:20 2010 +0200
empathy_tp_call_accept_incoming_call: early return if the call is not an incoming one
We use to rely in the call handler on the presence or not of the TpCall object
to check if the call was incoming or not.
But now TpCall object are created earlier so that's not true any more.
libempathy/empathy-tp-call.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index dfaf338..583e9fc 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -621,7 +621,9 @@ empathy_tp_call_accept_incoming_call (EmpathyTpCall *call)
g_return_if_fail (EMPATHY_IS_TP_CALL (call));
g_return_if_fail (priv->status == EMPATHY_TP_CALL_STATUS_PENDING);
- g_return_if_fail (priv->is_incoming);
+
+ if (!priv->is_incoming)
+ return;
DEBUG ("Accepting incoming call");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]