summaryrefslogtreecommitdiffstats
path: root/src/extension/dependency.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-06-19 02:32:07 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-06-19 02:32:07 +0000
commitf164dc6009f644939ba5fb09503fe0e35f1d4aae (patch)
tree281c32b52168c049ce35d0f459413c28aa92a7b1 /src/extension/dependency.cpp
parentAdd clip group option from Ponyscape (diff)
parentFix make check (diff)
downloadinkscape-f164dc6009f644939ba5fb09503fe0e35f1d4aae.tar.gz
inkscape-f164dc6009f644939ba5fb09503fe0e35f1d4aae.zip
Update to experimental r13404
(bzr r13090.1.84)
Diffstat (limited to 'src/extension/dependency.cpp')
-rw-r--r--src/extension/dependency.cpp20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index 78012ccc8..e46b6fbd2 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -57,14 +57,22 @@ Dependency::Dependency (Inkscape::XML::Node * in_repr)
Inkscape::GC::anchor(_repr);
- const gchar * location = _repr->attribute("location");
- for (int i = 0; i < LOCATION_CNT && location != NULL; i++) {
- if (!strcmp(location, _location_str[i])) {
- _location = (location_t)i;
- break;
+ if (const gchar * location = _repr->attribute("location")) {
+ for (int i = 0; i < LOCATION_CNT && location != NULL; i++) {
+ if (!strcmp(location, _location_str[i])) {
+ _location = (location_t)i;
+ break;
+ }
+ }
+ } else if (const gchar * location = _repr->attribute("reldir")) {
+ for (int i = 0; i < LOCATION_CNT && location != NULL; i++) {
+ if (!strcmp(location, _location_str[i])) {
+ _location = (location_t)i;
+ break;
+ }
}
}
-
+
const gchar * type = _repr->attribute("type");
for (int i = 0; i < TYPE_CNT && type != NULL; i++) {
if (!strcmp(type, _type_str[i])) {