From 59602b1fbb159f181a416ca710108b24d114e8db Mon Sep 17 00:00:00 2001
From: Aurelien Gateau <aurelien.gateau@canonical.com>
Date: Mon, 3 May 2010 15:48:17 +0200
Subject: Added main page

---
 libdbusmenu-glib/dbus-menu.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml
index 7937049..7bccf28 100644
--- a/libdbusmenu-glib/dbus-menu.xml
+++ b/libdbusmenu-glib/dbus-menu.xml
@@ -29,12 +29,18 @@ License version 3 and version 2.1 along with this program.  If not, see
 <http://www.gnu.org/licenses/>
 -->
 <node name="/" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
+    <dox:d><![CDATA[
+    @mainpage
+
+    The goal of DBusMenu is to expose menus on DBus.
+    
+    Main interface is documented here: @ref org::ayatana::dbusmenu
+    ]]></dox:d>
 	<interface name="org.ayatana.dbusmenu">
 		<dox:d><![CDATA[
-		The goal of this DBus interface is to be able to pass menu items
-		through DBus.
+		A DBus interface to expose menus on DBus.
 
-		Items are represented with a unique numeric id and a dictionary of
+		Menu items are represented with a unique numeric id and a dictionary of
 		properties.
 
 		To reduce the amount of DBus traffic, a property should only be returned
-- 
cgit v1.2.3


From f279e492d60f9e6b1e5bef55bc0deaa57dd24ea0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 9 May 2010 17:12:51 +0200
Subject: Check to make sure they're real nodes before parsing more.

---
 libdbusmenu-glib/client.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index d2ba541..c0d3b7a 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -533,6 +533,9 @@ build_proxies (DbusmenuClient * client)
 static gint
 parse_node_get_id (xmlNodePtr node)
 {
+	if (node->type != XML_ELEMENT_NODE) {
+		return -1;
+	}
 	if (g_strcmp0((gchar *)node->name, "menu") != 0) {
 		/* This kills some nodes early */
 		g_warning("XML Node is not 'menu' it is '%s'", node->name);
-- 
cgit v1.2.3