Merge branch 'gnome-3-6'

[empathy.git] / src / empathy-call-window.ui

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 7149a3e8b3bfd9947ed946abddbe8f8609b01307..f26f33b49312fb16a040c726746ee1acbc149970 100644 (file)
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -70,6 +70,18 @@
             <property name="label" translatable="yes">_Debug</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="menudebuggst">
+            <property name="name">menudebuggst</property>
+            <property name="label" translatable="yes">_GStreamer</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menudebugtp">
+            <property name="name">menudebugtp</property>
+            <property name="label" translatable="yes">_Telepathy</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="menuabout">
             <property name="stock_id">gtk-about</property>
@@ -114,7 +126,10 @@
         </menu>
         <menu action="help">
           <menuitem name="menucontents" action="menucontents"/>
-          <menuitem name="menudebug" action="menudebug"/>
+          <menu name="menudebug" action="menudebug">
+            <menuitem action="menudebuggst"/>
+            <menuitem action="menudebugtp"/>
+          </menu>
           <menuitem name="menuabout" action="menuabout"/>
         </menu>
       </menubar>
@@ -286,9 +301,8 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="microphone">
+                      <object class="GtkButton" id="microphone">
                         <property name="visible">True</property>
-                        <property name="active">True</property>
                         <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
                         <child>
                           <object class="GtkImage" id="microphone_icon">