summaryrefslogtreecommitdiffstats
path: root/src/extension/extension.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-09-25 09:35:59 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-09-25 09:35:59 +0000
commitea10837f7a960bb9b914df1f25798c0b3e1da60f (patch)
tree18cf55bd22a8104c8578f1fcb1f966390599e043 /src/extension/extension.cpp
parentosx-build.sh: sync with osxmenu (whitespace, formatting) (diff)
parentFix for #1334792. Correct inheritance for 'line-height' property. (diff)
downloadinkscape-ea10837f7a960bb9b914df1f25798c0b3e1da60f.tar.gz
inkscape-ea10837f7a960bb9b914df1f25798c0b3e1da60f.zip
update to trunk (r13564)
(bzr r13506.1.107)
Diffstat (limited to 'src/extension/extension.cpp')
-rw-r--r--src/extension/extension.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 06e35ff3e..6a22eb585 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -112,8 +112,13 @@ Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementat
_deps.push_back(new Dependency(child_repr));
} /* dependency */
if (!strcmp(chname, "script")) {
- _deps.push_back(new Dependency(child_repr->firstChild()));
- } /* check command as a dependency (see LP #505920) */
+ for (Inkscape::XML::Node *child = child_repr->firstChild(); child != NULL ; child = child->next()) {
+ if (child->type() == Inkscape::XML::ELEMENT_NODE) {
+ _deps.push_back(new Dependency(child));
+ break;
+ } /* skip non-element nodes (see LP #1372200) */
+ }
+ } /* check command as a dependency (see LP #505920) */
if (!strcmp(chname, "options")) {
silent = !strcmp( child_repr->attribute("silent"), "true" );
}