diff options
| author | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:33:18 +0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:33:18 +0800 |
| commit | 8dcbfe163b293dda9bc0481e846db3bdd4e0ea98 (patch) | |
| tree | ccd09bc3f224492e9d8c360c0b903e11f8b593ab /src/empathy-call-window.c | |
| parent | 3e8f25168aadd741ecc0fe8da4d1847eece5ff83 (diff) | |
| parent | c62744a26535b8778e6053e5d7c544ca9ccc1e5f (diff) | |
| download | gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.gz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.bz2 gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.lz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.xz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.zst gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.zip | |
Merge branch 'master' into mc5
Diffstat (limited to 'src/empathy-call-window.c')
| -rw-r--r-- | src/empathy-call-window.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 520a92821..bd958aada 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1346,8 +1346,10 @@ empathy_call_window_connected (gpointer user_data) EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); EmpathyCallWindowPriv *priv = GET_PRIV (self); EmpathyTpCall *call; - gboolean can_send_video = priv->video_input != NULL && priv->contact != NULL - && empathy_contact_can_voip_video (priv->contact); + gboolean can_send_video; + + can_send_video = priv->video_input != NULL && priv->contact != NULL && + empathy_contact_can_voip_video (priv->contact); g_object_get (priv->handler, "tp-call", &call, NULL); |