remove the "Always Show Video Preview" menuitem

We use buttons for that now.

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 5426e71d4270f112c4ccc5c52c9b441e3cb7d12e..d7c17b5676865d5bd4061bbc0f471a21b41d412b 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -128,7 +128,6 @@ struct _EmpathyCallWindowPriv
   GtkWidget *camera_button;
   GtkWidget *toolbar;
   GtkWidget *pane;
-  GtkAction *always_show_preview;
   GtkAction *send_video;
   GtkAction *redial;
   GtkAction *menu_fullscreen;
@@ -221,9 +220,6 @@ static void empathy_call_window_set_send_video (EmpathyCallWindow *window,
 static void empathy_call_window_send_video_toggled_cb (GtkToggleAction *toggle,
   EmpathyCallWindow *window);
 
-static void empathy_call_window_always_show_preview_toggled_cb (
-  GtkToggleAction *toggle, EmpathyCallWindow *window);
-
 static void empathy_call_window_mic_toggled_cb (
   GtkToggleToolButton *toggle, EmpathyCallWindow *window);
 
@@ -846,7 +842,6 @@ empathy_call_window_init (EmpathyCallWindow *self)
     "toolbar", &priv->toolbar,
     "send_video", &priv->send_video,
     "menuredial", &priv->redial,
-    "always_show_preview", &priv->always_show_preview,
     "ui_manager", &priv->ui_manager,
     "menufullscreen", &priv->menu_fullscreen,
     "camera_off", &priv->tool_button_camera_off,
@@ -862,8 +857,6 @@ empathy_call_window_init (EmpathyCallWindow *self)
     "microphone", "toggled", empathy_call_window_mic_toggled_cb,
     "camera", "toggled", empathy_call_window_camera_toggled_cb,
     "send_video", "toggled", empathy_call_window_send_video_toggled_cb,
-    "always_show_preview", "toggled",
-        empathy_call_window_always_show_preview_toggled_cb,
     "menufullscreen", "activate", empathy_call_window_fullscreen_cb,
     "camera_off", "toggled", tool_button_camera_off_toggled_cb,
     "camera_preview", "toggled", tool_button_camera_preview_toggled_cb,
@@ -2318,24 +2311,6 @@ empathy_call_window_send_video_toggled_cb (GtkToggleAction *toggle,
       GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), active);
 }
 
-static void
-empathy_call_window_always_show_preview_toggled_cb (GtkToggleAction *toggle,
-  EmpathyCallWindow *window)
-{
-  EmpathyCallWindowPriv *priv = GET_PRIV (window);
-
-  if (gtk_toggle_action_get_active (toggle))
-    {
-      display_video_preview (window, TRUE);
-    }
-  else
-    {
-      /* disable preview if we are not sending */
-      if (!priv->sending_video)
-        display_video_preview (window, FALSE);
-    }
-}
-
 static void
 empathy_call_window_mic_toggled_cb (GtkToggleToolButton *toggle,
   EmpathyCallWindow *window)

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 7f13a064c0f82ca3ee8ad09f4a25b5b0cb7304cf..485ab53a7e506a8a61e8ff3cb1677528b5848b4f 100644 (file)
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -38,13 +38,6 @@
             <property name="label" translatable="yes">_View</property>
           </object>
         </child>
-        <child>
-          <object class="GtkToggleAction" id="always_show_preview">
-            <property name="name">always_show_preview</property>
-            <property name="label" translatable="yes">Always show video preview</property>
-            <property name="active">False</property>
-          </object>
-        </child>
         <child>
           <object class="GtkAction" id="menufullscreen">
             <property name="stock_id">gtk-fullscreen</property>
@@ -62,7 +55,6 @@
           <menuitem action="menuredial"/>
         </menu>
         <menu action="view">
-          <menuitem action="always_show_preview"/>
           <menuitem action="menufullscreen"/>
         </menu>
       </menubar>