aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-call-window.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-03-23 22:45:56 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:08 +0800
commit9b68b6c2bd3a55a817857575814d43145644f419 (patch)
tree66222485a5401b1b42cfa27b0dd7a2355bd8b6d8 /src/empathy-call-window.c
parent1db300a69d039838d68cd4af8fddbc404f31c74c (diff)
downloadgsoc2013-empathy-9b68b6c2bd3a55a817857575814d43145644f419.tar
gsoc2013-empathy-9b68b6c2bd3a55a817857575814d43145644f419.tar.gz
gsoc2013-empathy-9b68b6c2bd3a55a817857575814d43145644f419.tar.bz2
gsoc2013-empathy-9b68b6c2bd3a55a817857575814d43145644f419.tar.lz
gsoc2013-empathy-9b68b6c2bd3a55a817857575814d43145644f419.tar.xz
gsoc2013-empathy-9b68b6c2bd3a55a817857575814d43145644f419.tar.zst
gsoc2013-empathy-9b68b6c2bd3a55a817857575814d43145644f419.zip
Prepare the video input pipeline when there is an initial content
Diffstat (limited to 'src/empathy-call-window.c')
-rw-r--r--src/empathy-call-window.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index c8c2de215..f16e6d4d6 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2559,12 +2559,24 @@ start_call (EmpathyCallWindow *self)
if (s == TPY_SENDING_STATE_PENDING_SEND ||
s == TPY_SENDING_STATE_SENDING)
- /* Enable 'send video' buttons and display the preview */
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_on), TRUE);
+ {
+ /* Enable 'send video' buttons and display the preview */
+ gtk_toggle_tool_button_set_active (
+ GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_on),
+ TRUE);
+ }
else
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_off), TRUE);
+ {
+ gtk_toggle_tool_button_set_active (
+ GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_off),
+ TRUE);
+
+ if (priv->video_preview == NULL)
+ {
+ create_video_preview (self);
+ add_video_preview_to_pipeline (self);
+ }
+ }
}
g_object_unref (call);