From b379e5e873e51d3bcad1fc055b2f7974267c7daa Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 22 Jun 2010 11:37:20 +0200 Subject: 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 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libempathy') diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c index dfaf3384b..583e9fc9f 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"); -- cgit