[empathy: 23/23] Merge branch 'change-audio'

[Jonny Lamb <jonnylamb src gnome org>]

commit 7876debb7bc9b6232817e68f00eb2d7484fd034a
Merge: 4651fb3 e17e618
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Mon Aug 1 13:48:32 2011 +0100

    Merge branch 'change-audio'
    
    Conflicts:
    	src/empathy-call-window.c
    	src/empathy-call-window.ui
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 configure.ac               |    2 +
 src/Makefile.am            |    8 +-
 src/empathy-audio-src.c    |  496 ++++++++++++++++++++++++++++++++++++++++++--
 src/empathy-audio-src.h    |   21 ++
 src/empathy-call-window.c  |   21 ++
 src/empathy-call-window.h  |    5 +
 src/empathy-call-window.ui |   16 ++
 src/empathy-mic-menu.c     |  420 +++++++++++++++++++++++++++++++++++++
 src/empathy-mic-menu.h     |   56 +++++
 9 files changed, 1021 insertions(+), 24 deletions(-)
---
diff --cc src/empathy-call-window.c
index 29d3c44,afd0252..5ed4e93
--- 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 d182600,8c0d577..88127e1
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@@ -18,6 -18,25 +18,19 @@@
            </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>
              <property name="label" translatable="yes">_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">