aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib/client.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-05-20 13:54:47 -0500
committerTed Gould <ted@gould.cx>2010-05-20 13:54:47 -0500
commit0d1146440b9f386fc521d08d97fc1c6643339adc (patch)
treeed1927abd138f8dcb18be088c946e14bf26f63bc /libdbusmenu-glib/client.c
parent2fd9f0d0c632cb9cb0cff3a843a4871109dee6ef (diff)
parentcc2773830760a016ec1b5c5af230fcd9114d267c (diff)
downloadlibdbusmenu-0d1146440b9f386fc521d08d97fc1c6643339adc.tar.gz
libdbusmenu-0d1146440b9f386fc521d08d97fc1c6643339adc.tar.bz2
libdbusmenu-0d1146440b9f386fc521d08d97fc1c6643339adc.zip
* Upstream Merge
* Fixing up VAPI files to build them correctly * Fix documentation title page * Reject text nodes early (warnings with Qt integration) * Autogen * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file names for package list. * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the typelib file.
Diffstat (limited to 'libdbusmenu-glib/client.c')
-rw-r--r--libdbusmenu-glib/client.c3
1 files changed, 3 insertions, 0 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);