diff options
| -rw-r--r-- | src/empathy-call-handler.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index 703ed3299..3389c8374 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -911,11 +911,22 @@ empathy_call_handler_start_call (EmpathyCallHandler *handler, { empathy_call_handler_start_tpfs (handler); - if (tp_call_channel_get_state (priv->call, NULL, NULL, NULL) == - TP_CALL_STATE_INITIALISED) - tp_call_channel_accept_async (priv->call, on_call_accepted_cb, NULL); + if (tp_channel_get_requested (TP_CHANNEL (priv->call))) + { + /* accept outgoing channels immediately */ + tp_call_channel_accept_async (priv->call, + on_call_accepted_cb, NULL); + } else - priv->accept_when_initialised = TRUE; + { + /* accepting incoming channels when they are INITIALISED */ + if (tp_call_channel_get_state (priv->call, NULL, NULL, NULL) == + TP_CALL_STATE_INITIALISED) + tp_call_channel_accept_async (priv->call, + on_call_accepted_cb, NULL); + else + priv->accept_when_initialised = TRUE; + } return; } |