diff options
| -rw-r--r-- | src/empathy-call-window.c | 25 | ||||
| -rw-r--r-- | src/empathy-call-window.ui | 8 |
2 files changed, 0 insertions, 33 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 5426e71d4..d7c17b567 100644 --- 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, @@ -2319,24 +2312,6 @@ empathy_call_window_send_video_toggled_cb (GtkToggleAction *toggle, } 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 7f13a064c..485ab53a7 100644 --- a/src/empathy-call-window.ui +++ b/src/empathy-call-window.ui @@ -39,13 +39,6 @@ </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> <property name="name">menufullscreen</property> @@ -62,7 +55,6 @@ <menuitem action="menuredial"/> </menu> <menu action="view"> - <menuitem action="always_show_preview"/> <menuitem action="menufullscreen"/> </menu> </menubar> |