Merge branch 'change-audio'
authorJonny Lamb <jonnylamb@gnome.org>
Mon, 1 Aug 2011 12:48:32 +0000 (13:48 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Mon, 1 Aug 2011 12:48:32 +0000 (13:48 +0100)
Conflicts:
src/empathy-call-window.c
src/empathy-call-window.ui

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
1  2 
src/empathy-call-window.c
src/empathy-call-window.ui

index 29d3c4463721c5cb9afb98cb289eb7b9c9e5851e,afd02522ba9241ece04f199d8c9e852a938e55ab..5ed4e93d3c49d3a767f7008a3f6b5592bad74a44
@@@ -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)
index d18260045150a319578a8decfef0b4394c98cef5,8c0d5777e6520bfce8a8485c7f2014ed3dfcfe94..88127e1adfa3f38f6123859f8e0e0bb566e3f10f
              <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>
          <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">