aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-11-25 12:17:51 +0000
committerRobert Bragg <robert@linux.intel.com>2010-11-25 12:17:51 +0000
commitd691ff980b8dd29730065b0ba4a74a387251eb5d (patch)
treea015795111ff2ba36f18b9857cc95f3517a886d1
parent218259b3c3565b46213f63e02d1c86425adce39e (diff)
downloadlibmatchboxwm2-rib/matchbox-next.tar.gz
libmatchboxwm2-rib/matchbox-next.tar.bz2
libmatchboxwm2-rib/matchbox-next.zip
theme: Don't _Stop the parser for "</theme>" tagsrib/matchbox-next
In xml_element_end_cb we were calling XML_StopParser when finding a </theme> tag, but the semantics of that are the XML_Parse will return an abort error which then results in us reporting a parse error. Instead of explicitly trying to stop the parser we simply ignore the </theme> tags and assume we will get an error from expat if the tag is unbalanced.
-rw-r--r--matchbox/mb-wm-theme.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/matchbox/mb-wm-theme.c b/matchbox/mb-wm-theme.c
index 7282e16..6db6392 100644
--- a/matchbox/mb-wm-theme.c
+++ b/matchbox/mb-wm-theme.c
@@ -1311,11 +1311,7 @@ xml_element_end_cb (void *data, const char *tag)
MBWM_DBG ("tag </%s>\n", tag);
- if (!strcmp (tag, "theme"))
- {
- XML_StopParser (exd->par, 0);
- }
- else if (!strcmp (tag, "client"))
+ if (!strcmp (tag, "client"))
{
if (ctx == XML_CTX_CLIENT)
{