diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-11-07 19:04:14 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-11-08 04:07:19 +0800 |
| commit | 4d72a7a6977aadd395f5c96977ab0a1db303cb46 (patch) | |
| tree | b4c43c1d63bab4fd4ff5cd6b206427fe591e0972 | |
| parent | 55ab1d4f324ad5e1befa2fe2147f36b9c47aacc1 (diff) | |
| download | gsoc2013-empathy-4d72a7a6977aadd395f5c96977ab0a1db303cb46.tar gsoc2013-empathy-4d72a7a6977aadd395f5c96977ab0a1db303cb46.tar.gz gsoc2013-empathy-4d72a7a6977aadd395f5c96977ab0a1db303cb46.tar.bz2 gsoc2013-empathy-4d72a7a6977aadd395f5c96977ab0a1db303cb46.tar.lz gsoc2013-empathy-4d72a7a6977aadd395f5c96977ab0a1db303cb46.tar.xz gsoc2013-empathy-4d72a7a6977aadd395f5c96977ab0a1db303cb46.tar.zst gsoc2013-empathy-4d72a7a6977aadd395f5c96977ab0a1db303cb46.zip | |
Call: Cope with not having the Channel direclty after startin a call
| -rw-r--r-- | src/empathy-call-window.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 39ae6f397..ab7dbeef8 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -3507,7 +3507,13 @@ start_call (EmpathyCallWindow *self) TpySendingState s; g_object_get (priv->handler, "call-channel", &call, NULL); - s = tpy_call_channel_get_video_state (call); + /* If the call channel isn't set yet we're requesting it, if we're + * requesting it with initial video it should be PENDING_SEND when we get + * it */ + if (call == NULL) + s = TPY_SENDING_STATE_PENDING_SEND; + else + s = tpy_call_channel_get_video_state (call); if (s == TPY_SENDING_STATE_PENDING_SEND || s == TPY_SENDING_STATE_SENDING) @@ -3528,7 +3534,8 @@ start_call (EmpathyCallWindow *self) } } - g_object_unref (call); + if (call != NULL) + g_object_unref (call); } } |