Merging in the no-xml based layout branch

1 files changed, 34 insertions, 42 deletions

diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml
index b5f5627..da14c63 100644
--- a/libdbusmenu-glib/dbus-menu.xml
+++ b/libdbusmenu-glib/dbus-menu.xml
@@ -174,34 +174,38 @@ License version 3 and version 2.1 along with this program.  If not, see
 <!-- Functions -->
 
 		<method name="GetLayout">
-			<dox:d><![CDATA[
-			Provides an XML representation of the menu hierarchy
-
-			XML syntax:
-
-			@verbatim
-<menu id="0"> # Root container
-	<menu id="1"> # First level menu, for example "File"
-		<menu id="2"/> ~ Second level menu, for example "Open"
-		<menu id="3"/>
-		...
-	</menu>
-	<menu id="4"> # Another first level menu, say "Edit"
-		...
-	</menu>
-	...
-</menu>
-			@endverbatim
-			]]></dox:d>
+			<dox:d>
+			  Provides the layout and propertiers that are attached to the entries
+			  that are in the layout.  It only gives the items that are children
+			  of the item that is specified in @parentId.  It will return all of the
+			  properties or specific ones depending of the value in @propertyNames.
+
+			  The format is recursive, where the second 'v' is in the same format
+			  as the original 'a(ia(sv)a(v))'.  If the @recursive flag is set to
+			  less than one then the second array will have zero entries.
+			</dox:d>
 			<arg type="i" name="parentId" direction="in">
 				<dox:d>The ID of the parent node for the layout.  For
 				grabbing the layout from the root node use zero.</dox:d>
 			</arg>
+			<arg type="i" name="recurse" direction="in">
+				<dox:d>
+				  The amount of levels of recursion to use.  -1, as value would
+				  deliver all the items under the @parentId.
+				</dox:d>
+			</arg>
+			<arg type="as" name="propertyNames" direction="in" >
+				<dox:d>
+					The list of item properties we are
+					interested in.  If there are no entries in the list all of
+					the properties will be sent.
+				</dox:d>
+			</arg>
 			<arg type="u" name="revision" direction="out">
 				<dox:d>The revision number of the layout.  For matching
 				with layoutUpdated signals.</dox:d>
 			</arg>
-			<arg type="s" name="layout" direction="out">
+			<arg type="(ia{sv}av)" name="layout" direction="out">
 				<dox:d>The layout as an XML string of IDs.</dox:d>
 			</arg>
 		</method>
@@ -236,33 +240,21 @@ License version 3 and version 2.1 along with this program.  If not, see
 			</arg>
 		</method>
 
-		<method name="GetChildren">
-			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="DBusMenuItemList"/>
-			<arg type="i" name="id" direction="in" />
-			<arg type="as" name="propertyNames" direction="in" />
-			<arg type="a(ia{sv})" name="properties" direction="out" />
-		</method>
-
 		<method name="GetProperty">
-			<arg type="i" name="id" direction="in" />
-			<arg type="s" name="name" direction="in" />
-			<arg type="v" name="value" direction="out" />
-		</method>
-
-		<method name="GetProperties">
 			<dox:d>
-			Returns multiple properties in one call. This is more efficient than
-			GetProperty.
-
+			  Get a signal property on a single item.  This is not useful if you're
+			  going to implement this interface, it should only be used if you're
+			  debugging via a commandline tool.
 			</dox:d>
-			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-			<arg type="i" name="id" direction="in" >
-				<dox:d>The item whose properties we want to retrieve.</dox:d>
+			<arg type="i" name="id" direction="in">
+				<dox:d>the id of the item which received the event</dox:d>
 			</arg>
-			<arg type="as" name="propertyNames" direction="in" >
-				<dox:d>List of string name of the properties we want.  If the list contains no entries, all properties are sent.</dox:d>
+			<arg type="s" name="name" direction="in">
+				<dox:d>the name of the property to get</dox:d>
+			</arg>
+			<arg type="v" name="value" direction="out">
+				<dox:d>the value of the property</dox:d>
 			</arg>
-			<arg type="a{sv}" name="properties" direction="out" />
 		</method>
 
 		<method name="Event">