X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Fmerge-3.ui;h=53ea41308878fe7620720b83cdb506c9bb4a81b3;hb=e09957a47da9425cc26d1b33cb4e9cc3e92e9ac7;hp=397930d27e04b6f6f3eb2642c6895e8b02093868;hpb=e7e395652cfac4aa5385aa91fd6079fae13dd129;p=~andy%2Fgtk

diff --git a/tests/merge-3.ui b/tests/merge-3.ui
index 397930d27..53ea41308 100644
--- a/tests/merge-3.ui
+++ b/tests/merge-3.ui
@@ -1,23 +1,29 @@
 <!--*- xml -*-->
-<Root>
-  <menu>
-    <submenu name="FileMenu" verb="StockFileMenuAction">
-      <menuitem name="New" verb="New2Action" />
-    </submenu>
+<ui>
+  <menubar>
+    <menu name="FileMenu" action="FileMenuAction">
+      <menuitem name="New" action="New2Action" />
+    </menu>
+    <menu name="JustifyMenu" action="JustifyMenuAction">
+      <menuitem name="Left" action="justify-left"/>
+      <menuitem name="Centre" action="justify-center"/>
+      <menuitem name="Right" action="justify-right"/>
+      <menuitem name="Fill" action="justify-fill"/>
+    </menu>
     <placeholder name="TestPlaceholder">
-      <submenu name="Test">
-        <menuitem name="Cut" verb="CutAction" />
-      </submenu>
+      <menu action="Test">
+        <menuitem name="Cut" action="CutAction" />
+      </menu>
     </placeholder>
-  </menu>
-  <dockitem name="toolbar1">
+  </menubar>
+  <toolbar action="toolbar1">
     <placeholder name="JustifyToolItems">
       <separator name="first-sep"/>
-      <toolitem name="Left" verb="justify-left"/>
-      <toolitem name="Centre" verb="justify-center"/>
-      <toolitem name="Right" verb="justify-right"/>
-      <toolitem name="Fill" verb="justify-fill"/>
+      <toolitem name="Left" action="justify-left"/>
+      <toolitem name="Centre" action="justify-center"/>
+      <toolitem name="Right" action="justify-right"/>
+      <toolitem name="Fill" action="justify-fill"/>
       <separator name="second-sep" />
     </placeholder>
-  </dockitem>
-</Root>
+  </toolbar>
+</ui>