diff options
| author | Moritz Eberl <moritz@semiodesk.com> | 2016-04-12 09:43:56 +0000 |
|---|---|---|
| committer | Moritz Eberl <moritz@semiodesk.com> | 2016-04-12 09:43:56 +0000 |
| commit | d2a9d82cd79c61f44e2224dee38847d4113c7eda (patch) | |
| tree | cebddd9c7afb25a43f72a73ddde21f5a427e480a /src/extension/system.cpp | |
| parent | Added a mechanism to load c++ extensions dynamically. (diff) | |
| download | inkscape-d2a9d82cd79c61f44e2224dee38847d4113c7eda.tar.gz inkscape-d2a9d82cd79c61f44e2224dee38847d4113c7eda.zip | |
fixed naming of methods. External extensions can now be other module types.
(bzr r14761.1.2)
Diffstat (limited to 'src/extension/system.cpp')
| -rw-r--r-- | src/extension/system.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/extension/system.cpp b/src/extension/system.cpp index 5a77ac28e..6b8e80d3c 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -490,11 +490,8 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation } case MODULE_PLUGIN: { Inkscape::Extension::Loader loader = Inkscape::Extension::Loader(); - loader.setBaseDirectory ( Inkscape::Application::profile_path("extensions")); - imp = loader.LoadImplementation(doc); - if( imp != NULL) { - return new Extension(repr, imp); - } + loader.set_base_directory ( Inkscape::Application::profile_path("extensions")); + imp = loader.load_implementation(doc); break; } default: { @@ -529,6 +526,7 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation break; } default: { + module = new Extension(repr, imp); break; } } |