Merge branch 'master' into tp-tube

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

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 6d1bbf6e1700a7af423b488d86ec24e976a31f82..ce3d85b56e11e1b0d264f2d7b9907948097c67e1 100644 (file)
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!--Generated with glade3 3.4.5 on Mon Feb 16 12:31:56 2009 -->
 <interface>
-  <object class="GtkUIManager" id="uimanager1">
+  <object class="GtkUIManager" id="ui_manager">
     <child>
       <object class="GtkActionGroup" id="actiongroup1">
         <child>
-          <object class="GtkAction" id="menuitem1">
-            <property name="name">menuitem1</property>
+          <object class="GtkAction" id="call">
+            <property name="name">call</property>
             <property name="label" translatable="yes">_Call</property>
           </object>
         </child>
@@ -14,6 +14,7 @@
           <object class="GtkToggleAction" id="send_video">
             <property name="name">send_video</property>
             <property name="label" translatable="yes">Send video</property>
+            <property name="sensitive">False</property>
           </object>
         </child>
         <child>
@@ -24,8 +25,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="menuitem3">
-            <property name="name">menuitem3</property>
+          <object class="GtkAction" id="view">
+            <property name="name">view</property>
             <property name="label" translatable="yes">_View</property>
           </object>
         </child>
@@ -39,22 +40,20 @@
     </child>
     <ui>
       <menubar name="menubar1">
-        <menu action="menuitem1">
+        <menu action="call">
           <menuitem action="send_video"/>
           <menuitem action="menuhangup"/>
         </menu>
-        <menu action="menuitem3">
+        <menu action="view">
           <menuitem action="show_preview"/>
         </menu>
       </menubar>
     </ui>
   </object>
-  <object class="GtkWindow" id="call_window">
-    <child>
       <object class="GtkVBox" id="call_window_vbox">
         <property name="visible">True</property>
         <child>
-          <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+          <object class="GtkMenuBar" constructor="ui_manager" id="menubar1">
             <property name="visible">True</property>
           </object>
           <packing>
@@ -86,6 +85,7 @@
             <child>
               <object class="GtkToggleToolButton" id="microphone">
                 <property name="visible">True</property>
+                <property name="active">True</property>
                 <property name="label" translatable="yes">Send Audio</property>
                 <property name="icon_name">gnome-stock-mic</property>
               </object>
@@ -98,6 +98,7 @@
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Send video</property>
                 <property name="icon_name">camera-web</property>
+                <property name="sensitive">False</property>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
@@ -135,6 +136,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>