From 6bc173c8f3606c87ff0ba0be84140ac72a4b243c Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Thu, 2 Jun 2011 11:29:00 +0100 Subject: CallWindow: add a dialpad menu entry --- src/empathy-call-window.c | 18 ++++++++++++++++++ src/empathy-call-window.ui | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index d9a7bb1b6..40024b9ef 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -124,6 +124,7 @@ struct _EmpathyCallWindowPriv GtkWidget *toolbar; GtkWidget *pane; GtkAction *redial; + GtkAction *menu_dialpad; GtkAction *menu_fullscreen; GtkAction *action_camera_on; GtkWidget *tool_button_camera_off; @@ -262,6 +263,9 @@ static void empathy_call_window_video_menu_popup (EmpathyCallWindow *window, static void empathy_call_window_redial_cb (gpointer object, EmpathyCallWindow *window); +static void empathy_call_window_dialpad_cb (gpointer object, + EmpathyCallWindow *window); + static void empathy_call_window_restart_call (EmpathyCallWindow *window); static void empathy_call_window_status_message (EmpathyCallWindow *window, @@ -1019,6 +1023,7 @@ empathy_call_window_init (EmpathyCallWindow *self) "microphone", &priv->mic_button, "toolbar", &priv->toolbar, "menuredial", &priv->redial, + "menudialpad", &priv->menu_dialpad, "ui_manager", &priv->ui_manager, "menufullscreen", &priv->menu_fullscreen, "camera_off", &priv->tool_button_camera_off, @@ -1046,6 +1051,7 @@ empathy_call_window_init (EmpathyCallWindow *self) "hangup", "clicked", empathy_call_window_hangup_cb, "menuredial", "activate", empathy_call_window_redial_cb, "redial", "clicked", empathy_call_window_redial_cb, + "menudialpad", "activate", empathy_call_window_dialpad_cb, "microphone", "toggled", empathy_call_window_mic_toggled_cb, "menufullscreen", "activate", empathy_call_window_fullscreen_cb, "camera_off", "toggled", tool_button_camera_off_toggled_cb, @@ -3065,6 +3071,18 @@ empathy_call_window_redial_cb (gpointer object, empathy_call_window_restart_call (window); } +static void +empathy_call_window_dialpad_cb (gpointer object, + EmpathyCallWindow *window) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (window); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->sidebar_button), + TRUE); + empathy_sidebar_set_page (EMPATHY_SIDEBAR (priv->sidebar), + priv->dtmf_panel); +} + static void empathy_call_window_fullscreen_cb (gpointer object, EmpathyCallWindow *window) diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui index ecd00dfc1..3a460ed68 100644 --- a/src/empathy-call-window.ui +++ b/src/empathy-call-window.ui @@ -25,6 +25,12 @@ False + + + menudialpad + _Dialpad + + camera @@ -82,6 +88,7 @@ + -- cgit v1.2.3