Use gssize for length, not gsize.

[~andy/gtk] / tests / merge-2.ui

diff --git a/tests/merge-2.ui b/tests/merge-2.ui
index cf32ecfcc42a35c18aaec1cb06a16be7cd41ba00..8a059298d138ddc6fb10b8f91e2696bb48f4e1fc 100644 (file)
--- a/tests/merge-2.ui
+++ b/tests/merge-2.ui
@@ -1,27 +1,27 @@
 <!--*- xml -*-->
-<Root>
-  <menu>
-    <submenu name="FileMenu" verb="StockFileMenuAction">
-      <menuitem name="New" verb="NewAction" pos="top" />
+<ui>
+  <menubar>
+    <menu name="FileMenu" action="StockFileMenuAction">
+      <menuitem name="New" action="NewAction" pos="top" />
       <separator />
-      <menuitem name="Quit" verb="QuitAction" />
-    </submenu>
-    <submenu name="HelpMenu" verb="StockHelpMenuAction">
-      <menuitem name="About" verb="AboutAction" />
-    </submenu>
-  </menu>
-  <dockitem name="toolbar1">
+      <menuitem name="Quit" action="QuitAction" />
+    </menu>
+    <menu name="HelpMenu" action="StockHelpMenuAction">
+      <menuitem name="About" action="AboutAction" />
+    </menu>
+  </menubar>
+  <toolbar name="toolbar1">
     <placeholder name="ToolbarPlaceholder">
-      <toolitem name="Quit" verb="QuitAction" />
+      <toolitem name="Quit" action="QuitAction" />
       <separator />
     </placeholder>
-  </dockitem>
+  </toolbar>
   <popups>
-    <popup name="FileMenu" verb="StockFileMenuAction">
-      <menuitem name="New" verb="NewAction" pos="top" />
-      <submenu name="HelpMenu" verb="StockHelpMenuAction">
-        <menuitem name="About" verb="AboutAction" />
-      </submenu>
+    <popup name="FileMenu" action="StockFileMenuAction">
+      <menuitem name="New" action="NewAction" pos="top" />
+      <menu name="HelpMenu" action="StockHelpMenuAction">
+        <menuitem name="About" action="AboutAction" />
+      </menu>
     </popup>
   </popups>
-</Root>
+</ui>