diff options
author | Ted Gould <ted@gould.cx> | 2010-01-22 14:53:39 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-01-22 14:53:39 -0600 |
commit | d82766dc0f4e240c92809b39dcea6967628071d7 (patch) | |
tree | ee90487f68dfbae75bea6eb2fca1968f863d386e /libdbusmenu-glib/client.c | |
parent | 4ca2136146ef6276e2be11bb3014786131645a54 (diff) | |
parent | 921eaf7f51026b56b0a504c91214d40d07ce6040 (diff) | |
download | libdbusmenu-d82766dc0f4e240c92809b39dcea6967628071d7.tar.gz libdbusmenu-d82766dc0f4e240c92809b39dcea6967628071d7.tar.bz2 libdbusmenu-d82766dc0f4e240c92809b39dcea6967628071d7.zip |
Sync to trunk
Diffstat (limited to 'libdbusmenu-glib/client.c')
-rw-r--r-- | libdbusmenu-glib/client.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 8b8d6e6..e9d57b4 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -514,34 +514,6 @@ build_proxies (DbusmenuClient * client) return; } -/* Get the "revision" attribute of the node, parse it and - return it. Also we're checking to ensure the node - is a 'menu' here. */ -static gint -parse_node_get_revision (xmlNodePtr node) -{ - 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); - return 0; - } - - xmlAttrPtr attrib; - for (attrib = node->properties; attrib != NULL; attrib = attrib->next) { - if (g_strcmp0((gchar *)attrib->name, "revision") == 0) { - if (attrib->children != NULL) { - guint revision = (guint)g_ascii_strtoull((gchar *)attrib->children->content, NULL, 10); - /* g_debug ("Found ID: %d", id); */ - return revision; - } - break; - } - } - - g_warning("Unable to find a revision on the node"); - return 0; -} - /* Get the ID attribute of the node, parse it and return it. Also we're checking to ensure the node is a 'menu' here. */ @@ -764,7 +736,6 @@ parse_layout (DbusmenuClient * client, const gchar * layout) xmldoc = xmlReadMemory(layout, g_utf8_strlen(layout, 16*1024), "dbusmenu.xml", NULL, 0); xmlNodePtr root = xmlDocGetRootElement(xmldoc); - gint revision = parse_node_get_revision(root); DbusmenuMenuitem * oldroot = priv->root; priv->root = parse_layout_xml(client, root, priv->root, NULL, priv->menuproxy); @@ -781,7 +752,7 @@ parse_layout (DbusmenuClient * client, const gchar * layout) g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE); } - return revision; + return 1; } /* When the layout property returns, here's where we take care of that. */ |