diff options
| author | Ted Gould <ted@gould.cx> | 2010-05-20 13:36:53 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-05-20 13:36:53 -0500 |
| commit | cc2773830760a016ec1b5c5af230fcd9114d267c (patch) | |
| tree | a069859d98768bd4cf25d948c29b9de7ffe8d247 | |
| parent | 6a4ae9bdcd09926f48ffd5f8677c11cd28cff0f1 (diff) | |
| parent | 5b82d2c3bc65418c2c4eb35e4a12556292c195ee (diff) | |
| download | libdbusmenu-cc2773830760a016ec1b5c5af230fcd9114d267c.tar.gz libdbusmenu-cc2773830760a016ec1b5c5af230fcd9114d267c.tar.bz2 libdbusmenu-cc2773830760a016ec1b5c5af230fcd9114d267c.zip | |
Sync to trunk
| -rw-r--r-- | libdbusmenu-glib/client.c | 3 | ||||
| -rw-r--r-- | libdbusmenu-glib/dbus-menu.xml | 12 |
2 files changed, 12 insertions, 3 deletions
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); 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 |