summaryrefslogtreecommitdiffstats
path: root/src/extension/dependency.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-07-02 14:49:36 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-07-02 14:49:36 +0000
commit7a3a974807f116c98c54bfb8b458207ed406f72d (patch)
treeb2bde20ab14176998f61688d116b74ff7b06b793 /src/extension/dependency.cpp
parentMerge https://gitlab.com/inkscape/inkscape into selectable-knots (diff)
parentMove directory scanners to new get_filenames(...) calls (diff)
downloadinkscape-7a3a974807f116c98c54bfb8b458207ed406f72d.tar.gz
inkscape-7a3a974807f116c98c54bfb8b458207ed406f72d.zip
Merge https://gitlab.com/inkscape/inkscape into selectable-knots
Diffstat (limited to 'src/extension/dependency.cpp')
-rw-r--r--src/extension/dependency.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index 837520381..827475011 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -18,6 +18,7 @@
#include "dependency.h"
#include "db.h"
#include "extension.h"
+#include "io/resource.h"
namespace Inkscape {
namespace Extension {
@@ -151,12 +152,11 @@ bool Dependency::check (void) const
Glib::ustring location(_string);
switch (_location) {
case LOCATION_EXTENSIONS: {
- for (unsigned int i=0; i<Inkscape::Extension::Extension::search_path.size(); i++) {
- std::string temploc = Glib::build_filename(Inkscape::Extension::Extension::search_path[i], location);
- if (Glib::file_test(temploc, filetest)) {
- location = temploc;
- break;
- }
+ using namespace Inkscape::IO::Resource;
+ Glib::ustring temploc = get_filename(EXTENSIONS, location.c_str());
+ if(Glib::file_test(temploc, filetest)) {
+ location = temploc;
+ break;
}
} /* PASS THROUGH!!! */
case LOCATION_ABSOLUTE: {