Port EmpathyCallWindow to new API

From: Xavier Claessens <xclaesse@gmail.com>

svn path=/trunk/; revision=2855

1 files changed, 53 insertions, 100 deletions

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 6d1bbf6e1..8ac599989 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -1,140 +1,93 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Mon Feb 16 12:31:56 2009 -->
 <interface>
-  <object class="GtkUIManager" id="uimanager1">
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkUIManager" id="uimanager1"/>
+  <object class="GtkVBox" id="call_window_vbox">
+    <property name="visible">True</property>
+    <property name="orientation">vertical</property>
     <child>
-      <object class="GtkActionGroup" id="actiongroup1">
-        <child>
-          <object class="GtkAction" id="menuitem1">
-            <property name="name">menuitem1</property>
-            <property name="label" translatable="yes">_Call</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="send_video">
-            <property name="name">send_video</property>
-            <property name="label" translatable="yes">Send video</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuhangup">
-            <property name="stock_id">gtk-cancel</property>
-            <property name="name">menuhangup</property>
-            <property name="label" translatable="yes">Hang up</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem3">
-            <property name="name">menuitem3</property>
-            <property name="label" translatable="yes">_View</property>
-          </object>
-        </child>
+      <object class="GtkHPaned" id="pane">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
         <child>
-          <object class="GtkToggleAction" id="show_preview">
-            <property name="name">show_preview</property>
-            <property name="label" translatable="yes">Video preview</property>
-          </object>
+          <placeholder/>
         </child>
       </object>
+      <packing>
+        <property name="position">0</property>
+      </packing>
     </child>
-    <ui>
-      <menubar name="menubar1">
-        <menu action="menuitem1">
-          <menuitem action="send_video"/>
-          <menuitem action="menuhangup"/>
-        </menu>
-        <menu action="menuitem3">
-          <menuitem action="show_preview"/>
-        </menu>
-      </menubar>
-    </ui>
-  </object>
-  <object class="GtkWindow" id="call_window">
     <child>
-      <object class="GtkVBox" id="call_window_vbox">
+      <object class="GtkToolbar" id="toolbar">
         <property name="visible">True</property>
         <child>
-          <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+          <object class="GtkToolButton" id="hangup">
             <property name="visible">True</property>
+            <property name="is_important">True</property>
+            <property name="label" translatable="yes">Hang up</property>
+            <property name="stock_id">gtk-cancel</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar">
+          <object class="GtkSeparatorToolItem" id="toolbutton1">
             <property name="visible">True</property>
-            <child>
-              <object class="GtkToolButton" id="hangup">
-                <property name="visible">True</property>
-                <property name="is_important">True</property>
-                <property name="label" translatable="yes">Hang up</property>
-                <property name="stock_id">gtk-cancel</property>
-              </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton1">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="microphone">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Send Audio</property>
-                <property name="icon_name">gnome-stock-mic</property>
-              </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="camera">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Send video</property>
-                <property name="icon_name">camera-web</property>
-              </object>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">1</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHPaned" id="pane">
+          <object class="GtkToggleToolButton" id="microphone">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
+            <property name="label" translatable="yes">Send Audio</property>
+            <property name="icon_name">gnome-stock-mic</property>
           </object>
           <packing>
-            <property name="position">2</property>
+            <property name="expand">False</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
-          <object class="GtkStatusbar" id="statusbar">
+          <object class="GtkToggleToolButton" id="camera">
             <property name="visible">True</property>
-            <property name="spacing">2</property>
+            <property name="label" translatable="yes">Send video</property>
+            <property name="icon_name">camera-web</property>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">3</property>
+            <property name="homogeneous">True</property>
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkMenuBar" id="menubar1">
+        <property name="visible">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkStatusbar" id="statusbar">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">3</property>
+      </packing>
     </child>
   </object>
 </interface>