aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-22 17:37:20 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-22 17:59:34 +0800
commitb379e5e873e51d3bcad1fc055b2f7974267c7daa (patch)
tree355ae3eb1cbb51e9254b948f1d5a5494d1fedffc /libempathy
parentbd2d501f03e157f8f26a52f75e06dcb49621f663 (diff)
downloadgsoc2013-empathy-b379e5e873e51d3bcad1fc055b2f7974267c7daa.tar
gsoc2013-empathy-b379e5e873e51d3bcad1fc055b2f7974267c7daa.tar.gz
gsoc2013-empathy-b379e5e873e51d3bcad1fc055b2f7974267c7daa.tar.bz2
gsoc2013-empathy-b379e5e873e51d3bcad1fc055b2f7974267c7daa.tar.lz
gsoc2013-empathy-b379e5e873e51d3bcad1fc055b2f7974267c7daa.tar.xz
gsoc2013-empathy-b379e5e873e51d3bcad1fc055b2f7974267c7daa.tar.zst
gsoc2013-empathy-b379e5e873e51d3bcad1fc055b2f7974267c7daa.zip
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.
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-call.c4
1 files changed, 3 insertions, 1 deletions
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");