aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-03-23 22:45:56 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-03-23 23:12:07 +0800
commit3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b (patch)
treeb911f894fdd6b8698a34aee957411a172dc331d5
parente3849f0476977eac243b5baafd10b3075f1ceee1 (diff)
downloadgsoc2013-empathy-3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b.tar
gsoc2013-empathy-3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b.tar.gz
gsoc2013-empathy-3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b.tar.bz2
gsoc2013-empathy-3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b.tar.lz
gsoc2013-empathy-3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b.tar.xz
gsoc2013-empathy-3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b.tar.zst
gsoc2013-empathy-3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b.zip
Prepare the video input pipeline when there is an initial content
-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 22db18704..2c8c860e5 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2561,12 +2561,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);