aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-02 18:29:00 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:08 +0800
commit6bc173c8f3606c87ff0ba0be84140ac72a4b243c (patch)
tree3b49ebb731ba178e60bcf54f3735e22fb0b2a7ba /src
parenta9f6738541b98e591e51bd321902acc5c8200d9b (diff)
downloadgsoc2013-empathy-6bc173c8f3606c87ff0ba0be84140ac72a4b243c.tar
gsoc2013-empathy-6bc173c8f3606c87ff0ba0be84140ac72a4b243c.tar.gz
gsoc2013-empathy-6bc173c8f3606c87ff0ba0be84140ac72a4b243c.tar.bz2
gsoc2013-empathy-6bc173c8f3606c87ff0ba0be84140ac72a4b243c.tar.lz
gsoc2013-empathy-6bc173c8f3606c87ff0ba0be84140ac72a4b243c.tar.xz
gsoc2013-empathy-6bc173c8f3606c87ff0ba0be84140ac72a4b243c.tar.zst
gsoc2013-empathy-6bc173c8f3606c87ff0ba0be84140ac72a4b243c.zip
CallWindow: add a dialpad menu entry
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c18
-rw-r--r--src/empathy-call-window.ui7
2 files changed, 25 insertions, 0 deletions
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,
@@ -3066,6 +3072,18 @@ empathy_call_window_redial_cb (gpointer object,
}
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
@@ -26,6 +26,12 @@
</object>
</child>
<child>
+ <object class="GtkAction" id="menudialpad">
+ <property name="name">menudialpad</property>
+ <property name="label" translatable="yes">_Dialpad</property>
+ </object>
+ </child>
+ <child>
<object class="GtkAction" id="camera">
<property name="name">camera</property>
<property name="label" translatable="yes">V_ideo</property>
@@ -82,6 +88,7 @@
<menu action="call">
<menuitem action="menuhangup"/>
<menuitem action="menuredial"/>
+ <menuitem action="menudialpad"/>
</menu>
<menu action="camera">
<menuitem action="action_camera_off"/>