diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-03-16 03:06:20 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-09 17:20:07 +0800 |
| commit | 7992d97253ff1cecb4281191d0af459799ce9a21 (patch) | |
| tree | 49d0f3cf58d13e91d7ae335025f6d182a5d17910 /src/empathy-call-handler.c | |
| parent | 6786331e5d8411c48e0b2700cb20c434add2845d (diff) | |
| download | gsoc2013-empathy-7992d97253ff1cecb4281191d0af459799ce9a21.tar gsoc2013-empathy-7992d97253ff1cecb4281191d0af459799ce9a21.tar.gz gsoc2013-empathy-7992d97253ff1cecb4281191d0af459799ce9a21.tar.bz2 gsoc2013-empathy-7992d97253ff1cecb4281191d0af459799ce9a21.tar.lz gsoc2013-empathy-7992d97253ff1cecb4281191d0af459799ce9a21.tar.xz gsoc2013-empathy-7992d97253ff1cecb4281191d0af459799ce9a21.tar.zst gsoc2013-empathy-7992d97253ff1cecb4281191d0af459799ce9a21.zip | |
Don't start the Call when the streams start
Since that can happen before the call is accepted. Instead of that,
wait for the Call state to be ACCEPTED.
Conflicts:
src/empathy-call-window.c
Diffstat (limited to 'src/empathy-call-handler.c')
| -rw-r--r-- | src/empathy-call-handler.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index 752405727..e35afbde7 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -51,6 +51,7 @@ enum { SINK_PAD_REMOVED, CLOSED, CANDIDATES_CHANGED, + STATE_CHANGED, LAST_SIGNAL }; @@ -176,6 +177,8 @@ on_call_state_changed_cb (TpyCallChannel *call, { if (state == TPY_CALL_STATE_ENDED) tp_channel_close_async (TP_CHANNEL (call), NULL, NULL); + + g_signal_emit (handler, signals[STATE_CHANGED], 0, state); } static void @@ -469,6 +472,12 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); + + signals[STATE_CHANGED] = + g_signal_new ("state-changed", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, 0, NULL, NULL, + g_cclosure_marshal_VOID__UINT, + G_TYPE_NONE, 1, G_TYPE_UINT); } EmpathyCallHandler * |