diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
| commit | 241554b7ad311b5868ba284c7a4e6a410432b9bd (patch) | |
| tree | 8bf6fed572d27e9b97ca60b90ae1684ba4856eeb /src/extension/dependency.cpp | |
| parent | Use .xml when exporting shortcuts by default (diff) | |
| parent | Shortcuts: Fix for 7d248fbba5b0c24d9a24cda8c3f2e79f96395553 (is_user_set was ... (diff) | |
| download | inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.tar.gz inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.zip | |
Merge branch 'master' into shortcuts
Diffstat (limited to 'src/extension/dependency.cpp')
| -rw-r--r-- | src/extension/dependency.cpp | 12 |
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: { |