summaryrefslogtreecommitdiffstats
path: root/src/extension/system.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-09-22 01:23:04 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-09-22 01:23:04 +0000
commit7cd9900d0d7ff692a6cf0a0fbfa3651413c27ca8 (patch)
tree733ddd2e985d44d1ebc3318dee89a8658424aaa9 /src/extension/system.cpp
parentfix CTRL+button2 rotation direction (diff)
downloadinkscape-7cd9900d0d7ff692a6cf0a0fbfa3651413c27ca8.tar.gz
inkscape-7cd9900d0d7ff692a6cf0a0fbfa3651413c27ca8.zip
Fix problems on dialogs with extensions. TODO: Add dialog on drag&drop a SVG
Diffstat (limited to 'src/extension/system.cpp')
-rw-r--r--src/extension/system.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index 2a74c6b0c..daad169aa 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -99,12 +99,14 @@ SPDocument *open(Extension *key, gchar const *filename)
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
bool ask = prefs->getBool("/dialogs/import/ask");
Glib::ustring id = Glib::ustring(imod->get_id(), 22);
- if (id.compare("org.inkscape.input.svg") == 0 &&
- ((strcmp(prefs->getString("/options/openmethod/value").c_str(), "done") != 0 &&
- strcmp(prefs->getString("/options/openmethod/value").c_str(), "import") != 0) ||
- !ask)) {
- show = false;
- imod->set_gui(false);
+ if (id.compare("org.inkscape.input.svg") == 0) {
+ if (ask && prefs->getBool("/options/onimport", false)) {
+ show = true;
+ imod->set_gui(true);
+ } else {
+ show = false;
+ imod->set_gui(false);
+ }
} else if(strlen(imod->get_id()) > 27) {
id = Glib::ustring(imod->get_id(), 28);
if (!ask && id.compare( "org.inkscape.input.gdkpixbuf") == 0) {