aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-17 22:07:30 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-01 16:15:39 +0800
commit1f5ff2f5609f1915d20140f0446a47088c3d6fb5 (patch)
tree5f9f84ef5d38049e55691bb22fe1ecd4fc200437
parentd8b0cb43c5cfc1bae067ce513a440327e181171e (diff)
downloadgsoc2013-empathy-1f5ff2f5609f1915d20140f0446a47088c3d6fb5.tar
gsoc2013-empathy-1f5ff2f5609f1915d20140f0446a47088c3d6fb5.tar.gz
gsoc2013-empathy-1f5ff2f5609f1915d20140f0446a47088c3d6fb5.tar.bz2
gsoc2013-empathy-1f5ff2f5609f1915d20140f0446a47088c3d6fb5.tar.lz
gsoc2013-empathy-1f5ff2f5609f1915d20140f0446a47088c3d6fb5.tar.xz
gsoc2013-empathy-1f5ff2f5609f1915d20140f0446a47088c3d6fb5.tar.zst
gsoc2013-empathy-1f5ff2f5609f1915d20140f0446a47088c3d6fb5.zip
Allow to use the video preview when the call has been terminated (#602937)
-rw-r--r--src/empathy-call-window.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index fdb096290..e69e2436c 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1598,15 +1598,26 @@ empathy_call_window_disconnected (EmpathyCallWindow *self)
gtk_action_set_sensitive (priv->redial, TRUE);
gtk_widget_set_sensitive (priv->redial_button, TRUE);
- /* Reseting the send_video, camera_buton and mic_button to their
- initial state */
+ /* Unsensitive the camera and mic button */
gtk_widget_set_sensitive (priv->tool_button_camera_on, FALSE);
gtk_widget_set_sensitive (priv->mic_button, FALSE);
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_off), TRUE);
+
+ /* Be sure that the mic button is enabled */
gtk_toggle_tool_button_set_active (
GTK_TOGGLE_TOOL_BUTTON (priv->mic_button), TRUE);
+ if (priv->camera_state == CAMERA_STATE_ON)
+ {
+ /* Enable the 'preview' button as we are not sending atm. */
+ gtk_toggle_tool_button_set_active (
+ GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_preview), TRUE);
+ }
+ else if (priv->camera_state == CAMERA_STATE_PREVIEW)
+ {
+ /* Restart the preview with the new pipeline. */
+ display_video_preview (self, TRUE);
+ }
+
gtk_progress_bar_set_fraction (
GTK_PROGRESS_BAR (priv->volume_progress_bar), 0);