]> git.0d.be Git - empathy.git/commitdiff
Prepare the video input pipeline when there is an initial content
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>
Wed, 23 Mar 2011 14:45:56 +0000 (14:45 +0000)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 9 Jun 2011 09:20:08 +0000 (10:20 +0100)
src/empathy-call-window.c

index c8c2de2151063288a8f657759ec48eaffe02cb9c..f16e6d4d6b0d1235dce095c035678efe77472ae1 100644 (file)
@@ -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);