make disable_camera, enable_preview and enable_camera no-op if we are already in...

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 8f657f62657f77d66da82c153dd5eaaf2925a72d..1ecfd956c4a6594b933a89aa3d34a18183665f1b 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -737,6 +737,11 @@ disable_camera (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
+  if (priv->camera_state == CAMERA_STATE_OFF)
+    return;
+
+  DEBUG ("disable camera");
+
   display_video_preview (self, FALSE);
   empathy_call_window_set_send_video (self, FALSE);
 
@@ -772,10 +777,6 @@ tool_button_camera_off_toggled_cb (GtkToggleToolButton *toggle,
       return;
     }
 
-  if (priv->camera_state == CAMERA_STATE_OFF)
-    return;
-
-  DEBUG ("disable camera");
   disable_camera (self);
 }
 
@@ -784,6 +785,11 @@ enable_preview (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
+  if (priv->camera_state == CAMERA_STATE_PREVIEW)
+    return;
+
+  DEBUG ("enable preview");
+
   if (priv->camera_state == CAMERA_STATE_ON)
     /* preview is already displayed so we just have to stop sending */
     empathy_call_window_set_send_video (self, FALSE);
@@ -822,10 +828,6 @@ tool_button_camera_preview_toggled_cb (GtkToggleToolButton *toggle,
       return;
     }
 
-  if (priv->camera_state == CAMERA_STATE_PREVIEW)
-    return;
-
-  DEBUG ("enable preview");
   enable_preview (self);
 }
 
@@ -834,6 +836,11 @@ enable_camera (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
+  if (priv->camera_state == CAMERA_STATE_ON)
+    return;
+
+  DEBUG ("enable camera");
+
   empathy_call_window_set_send_video (self, TRUE);
 
   block_camera_control_signals (self);
@@ -868,10 +875,6 @@ tool_button_camera_on_toggled_cb (GtkToggleToolButton *toggle,
       return;
     }
 
-  if (priv->camera_state == CAMERA_STATE_ON)
-    return;
-
-  DEBUG ("enable camera");
   enable_camera (self);
 }