From: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon, 1 Aug 2011 12:48:32 +0000 (+0100)
Subject: Merge branch 'change-audio'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=7876debb7bc9b6232817e68f00eb2d7484fd034a

Merge branch 'change-audio'

Conflicts:
	src/empathy-call-window.c
	src/empathy-call-window.ui

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
---

7876debb7bc9b6232817e68f00eb2d7484fd034a
diff --cc src/empathy-call-window.c
index 29d3c446,afd02522..5ed4e93d
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@@ -61,6 -59,8 +61,7 @@@
  #include "empathy-audio-src.h"
  #include "empathy-audio-sink.h"
  #include "empathy-video-src.h"
 -#include "ev-sidebar.h"
+ #include "empathy-mic-menu.h"
  
  #define CONTENT_HBOX_BORDER_WIDTH 6
  #define CONTENT_HBOX_SPACING 3
@@@ -211,7 -220,7 +212,8 @@@ struct _EmpathyCallWindowPri
  
    EmpathySoundManager *sound_mgr;
  
 +  GSettings *settings;
+   EmpathyMicMenu *mic_menu;
  };
  
  #define GET_PRIV(o) (EMPATHY_CALL_WINDOW (o)->priv)
diff --cc src/empathy-call-window.ui
index d1826004,8c0d5777..88127e1a
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@@ -17,6 -17,25 +17,19 @@@
              <property name="label" translatable="yes">Hang up</property>
            </object>
          </child>
 -        <child>
 -          <object class="GtkToggleAction" id="menusidebar">
 -            <property name="name">menusidebar</property>
 -            <property name="label" translatable="yes">_Sidebar</property>
 -          </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>
@@@ -55,8 -74,12 +68,11 @@@
          <menu action="call">
            <menuitem action="menuhangup"/>
          </menu>
+         <menu action="edit">
+           <menu action="menumicrophone"/>
+         </menu>
          <menu action="view">
            <menuitem action="menufullscreen"/>
 -          <menuitem action="menusidebar"/>
          </menu>
        </menubar>
        <popup name="video-popup">