From 720bdb8daf6727700eb6df80bc057a93d45b277a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <maclas@gmx.de>
Date: Tue, 26 Aug 2003 00:13:59 +0000
Subject: Use gssize for length, not gsize.

2003-08-26  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize
	for length, not gsize.

	* gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to
	<ui> and make it optional in strings. Rename verb to action, <dockitem>
	to <toolbar>, <menu> to <menubar>, <submenu> to <menu>.

	* demos/gtk-demo/appwindow.c:
	* tests/testactions.c:
	* tests/testmerge.c:
	* tests/merge-1.ui:
	* tests/merge-2.ui:
	* tests/merge-3.ui: Adjust to the new XML format.
---
 tests/testactions.c | 80 ++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

(limited to 'tests/testactions.c')

diff --git a/tests/testactions.c b/tests/testactions.c
index 131d0ccd20..9a3ae08200 100644
--- a/tests/testactions.c
+++ b/tests/testactions.c
@@ -141,58 +141,56 @@ static guint n_entries = G_N_ELEMENTS (entries);
 /* XML description of the menus for the test app.  The parser understands
  * a subset of the Bonobo UI XML format, and uses GMarkup for parsing */
 static const gchar *ui_info =
-"<Root>\n"
-"  <menu>\n"
-"    <submenu name=\"Menu _1\" verb=\"Menu1Action\">\n"
-"      <menuitem name=\"cut\" verb=\"cut\" />\n"
-"      <menuitem name=\"copy\" verb=\"copy\" />\n"
-"      <menuitem name=\"paste\" verb=\"paste\" />\n"
+"  <menubar>\n"
+"    <menu name=\"Menu _1\" action=\"Menu1Action\">\n"
+"      <menuitem name=\"cut\" action=\"cut\" />\n"
+"      <menuitem name=\"copy\" action=\"copy\" />\n"
+"      <menuitem name=\"paste\" action=\"paste\" />\n"
 "      <separator name=\"sep1\" />\n"
-"      <menuitem name=\"bold1\" verb=\"bold\" />\n"
-"      <menuitem name=\"bold2\" verb=\"bold\" />\n"
+"      <menuitem name=\"bold1\" action=\"bold\" />\n"
+"      <menuitem name=\"bold2\" action=\"bold\" />\n"
 "      <separator name=\"sep2\" />\n"
-"      <menuitem name=\"toggle-cnp\" verb=\"toggle-cnp\" />\n"
+"      <menuitem name=\"toggle-cnp\" action=\"toggle-cnp\" />\n"
 "      <separator name=\"sep3\" />\n"
-"      <menuitem name=\"quit\" verb=\"quit\" />\n"
-"    </submenu>\n"
-"    <submenu name=\"Menu _2\" verb=\"Menu2Action\">\n"
-"      <menuitem name=\"cut\" verb=\"cut\" />\n"
-"      <menuitem name=\"copy\" verb=\"copy\" />\n"
-"      <menuitem name=\"paste\" verb=\"paste\" />\n"
+"      <menuitem name=\"quit\" action=\"quit\" />\n"
+"    </menu>\n"
+"    <menu name=\"Menu _2\" action=\"Menu2Action\">\n"
+"      <menuitem name=\"cut\" action=\"cut\" />\n"
+"      <menuitem name=\"copy\" action=\"copy\" />\n"
+"      <menuitem name=\"paste\" action=\"paste\" />\n"
 "      <separator name=\"sep4\"/>\n"
-"      <menuitem name=\"bold\" verb=\"bold\" />\n"
+"      <menuitem name=\"bold\" action=\"bold\" />\n"
 "      <separator name=\"sep5\"/>\n"
-"      <menuitem name=\"justify-left\" verb=\"justify-left\" />\n"
-"      <menuitem name=\"justify-center\" verb=\"justify-center\" />\n"
-"      <menuitem name=\"justify-right\" verb=\"justify-right\" />\n"
-"      <menuitem name=\"justify-fill\" verb=\"justify-fill\" />\n"
+"      <menuitem name=\"justify-left\" action=\"justify-left\" />\n"
+"      <menuitem name=\"justify-center\" action=\"justify-center\" />\n"
+"      <menuitem name=\"justify-right\" action=\"justify-right\" />\n"
+"      <menuitem name=\"justify-fill\" action=\"justify-fill\" />\n"
 "      <separator name=\"sep6\"/>\n"
-"      <menuitem  name=\"customise-accels\" verb=\"customise-accels\" />\n"
+"      <menuitem  name=\"customise-accels\" action=\"customise-accels\" />\n"
 "      <separator name=\"sep7\"/>\n"
-"      <menuitem verb=\"toolbar-icons\" />\n"
-"      <menuitem verb=\"toolbar-text\" />\n"
-"      <menuitem verb=\"toolbar-both\" />\n"
-"      <menuitem verb=\"toolbar-both-horiz\" />\n"
+"      <menuitem action=\"toolbar-icons\" />\n"
+"      <menuitem action=\"toolbar-text\" />\n"
+"      <menuitem action=\"toolbar-both\" />\n"
+"      <menuitem action=\"toolbar-both-horiz\" />\n"
 "      <separator name=\"sep8\"/>\n"
-"      <menuitem verb=\"toolbar-small-icons\" />\n"
-"      <menuitem verb=\"toolbar-large-icons\" />\n"
-"    </submenu>\n"
-"  </menu>\n"
-"  <dockitem name=\"toolbar\">\n"
-"    <toolitem name=\"cut\" verb=\"cut\" />\n"
-"    <toolitem name=\"copy\" verb=\"copy\" />\n"
-"    <toolitem name=\"paste\" verb=\"paste\" />\n"
+"      <menuitem action=\"toolbar-small-icons\" />\n"
+"      <menuitem action=\"toolbar-large-icons\" />\n"
+"    </menu>\n"
+"  </menubar>\n"
+"  <toolbar name=\"toolbar\">\n"
+"    <toolitem name=\"cut\" action=\"cut\" />\n"
+"    <toolitem name=\"copy\" action=\"copy\" />\n"
+"    <toolitem name=\"paste\" action=\"paste\" />\n"
 "    <separator name=\"sep9\" />\n"
-"    <toolitem name=\"bold\" verb=\"bold\" />\n"
+"    <toolitem name=\"bold\" action=\"bold\" />\n"
 "    <separator name=\"sep10\" />\n"
-"    <toolitem name=\"justify-left\" verb=\"justify-left\" />\n"
-"    <toolitem name=\"justify-center\" verb=\"justify-center\" />\n"
-"    <toolitem name=\"justify-right\" verb=\"justify-right\" />\n"
-"    <toolitem name=\"justify-fill\" verb=\"justify-fill\" />\n"
+"    <toolitem name=\"justify-left\" action=\"justify-left\" />\n"
+"    <toolitem name=\"justify-center\" action=\"justify-center\" />\n"
+"    <toolitem name=\"justify-right\" action=\"justify-right\" />\n"
+"    <toolitem name=\"justify-fill\" action=\"justify-fill\" />\n"
 "    <separator name=\"sep11\"/>\n"
-"    <toolitem name=\"quit\" verb=\"quit\" />\n"
-"  </dockitem>\n"
-"</Root>\n";
+"    <toolitem name=\"quit\" action=\"quit\" />\n"
+"  </toolbar>\n";
 
 static void
 add_widget (GtkUIManager *merge,
-- 
cgit v1.2.1