[empathy/gnome-2-34] Prepare the video input pipeline when there is an initial content
- From: Sjoerd Simons <sjoerds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-34] Prepare the video input pipeline when there is an initial content
- Date: Wed, 23 Mar 2011 15:12:49 +0000 (UTC)
commit 3fcdbfb8bf8ccf9b510e977ad8847dd0639def4b
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Wed Mar 23 14:45:56 2011 +0000
Prepare the video input pipeline when there is an initial content
src/empathy-call-window.c | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 22db187..2c8c860 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]