diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2011-08-01 20:48:32 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2011-08-01 20:48:32 +0800 |
| commit | 7876debb7bc9b6232817e68f00eb2d7484fd034a (patch) | |
| tree | bd4ca2a3e5416d8668dc04acba1ce85d13f2b340 /src/empathy-call-window.ui | |
| parent | 4651fb354e601f34dc9df08f2b506f765e455ead (diff) | |
| parent | e17e6184ca30b2164e7b30d1a35f504b87973400 (diff) | |
| download | gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.gz gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.bz2 gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.lz gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.xz gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.zst gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.zip | |
Merge branch 'change-audio'
Conflicts:
src/empathy-call-window.c
src/empathy-call-window.ui
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'src/empathy-call-window.ui')
| -rw-r--r-- | src/empathy-call-window.ui | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui index d18260045..88127e1ad 100644 --- a/src/empathy-call-window.ui +++ b/src/empathy-call-window.ui @@ -18,6 +18,19 @@ </object> </child> <child> + <object class="GtkAction" id="edit"> + <property name="name">edit</property> + <property name="label" translatable="yes">_Edit</property> + </object> + </child> + <child> + <object class="GtkAction" id="menumicrophone"> + <property name="label" translatable="yes">_Microphone</property> + <property name="name">menumicrophone</property> + <property name="icon_name">gnome-stock-mic</property> + </object> + </child> + <child> <object class="GtkAction" id="view"> <property name="name">view</property> <property name="label" translatable="yes">_View</property> @@ -55,6 +68,9 @@ <menu action="call"> <menuitem action="menuhangup"/> </menu> + <menu action="edit"> + <menu action="menumicrophone"/> + </menu> <menu action="view"> <menuitem action="menufullscreen"/> </menu> |