summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Storz <eduard.braun2@gmx.de>2019-07-21 17:03:14 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-08-31 14:50:38 +0000
commit68a6771cd153a06d99c84901330e0c30fccfb9b7 (patch)
treefaf96a987d52f5b45c4dd865908425b4331df6f0
parentRemove unused and disabled "help" feature for extensions (diff)
downloadinkscape-68a6771cd153a06d99c84901330e0c30fccfb9b7.tar.gz
inkscape-68a6771cd153a06d99c84901330e0c30fccfb9b7.zip
Remove effectively unused "silent" option from extensions.
See also https://gitlab.com/inkscape/inkscape/merge_requests/698
-rw-r--r--src/extension/execution-env.cpp18
-rw-r--r--src/extension/extension.cpp16
-rw-r--r--src/extension/extension.h2
3 files changed, 9 insertions, 27 deletions
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index a2bae3832..9293e5655 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -127,17 +127,15 @@ ExecutionEnv::createWorkingDialog () {
_visibleDialog->signal_response().connect(sigc::mem_fun(this, &ExecutionEnv::workingCanceled));
g_free(dlgmessage);
- if (!_effect->is_silent()){
- Gtk::Dialog *dlg = _effect->get_pref_dialog();
- if (dlg) {
- _visibleDialog->set_transient_for(*dlg);
- } else {
- // ToDo: Do we need to make the window transient for the main window here?
- // Currently imossible to test because of GUI freezing during save,
- // see https://bugs.launchpad.net/inkscape/+bug/967416
- }
- _visibleDialog->show_now();
+ Gtk::Dialog *dlg = _effect->get_pref_dialog();
+ if (dlg) {
+ _visibleDialog->set_transient_for(*dlg);
+ } else {
+ // ToDo: Do we need to make the window transient for the main window here?
+ // Currently imossible to test because of GUI freezing during save,
+ // see https://bugs.launchpad.net/inkscape/+bug/967416
}
+ _visibleDialog->show_now();
return;
}
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 62d6f4590..e5cee3b8e 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -51,8 +51,7 @@ std::ofstream Extension::error_file;
a name and an ID the module will be left in an errored state.
*/
Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp)
- : silent(false)
- , _gui(true)
+ : _gui(true)
, execution_env(nullptr)
{
repr = in_repr;
@@ -103,9 +102,6 @@ Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementat
} /* skip non-element nodes (see LP #1372200) */
}
} /* check command as a dependency (see LP #505920) */
- if (!strcmp(chname, "options")) {
- silent = !strcmp( child_repr->attribute("silent"), "true" );
- }
child_repr = child_repr->next();
}
@@ -320,16 +316,6 @@ Extension::get_repr ()
}
/**
- \return bool
- \brief Whether this extension should hide the "working, please wait" dialog
-*/
-bool
-Extension::is_silent ()
-{
- return silent;
-}
-
-/**
\return The textual id of this extension
\brief Get the ID of this extension - not a copy don't delete!
*/
diff --git a/src/extension/extension.h b/src/extension/extension.h
index dd93da6c2..697219ae0 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -104,7 +104,6 @@ private:
state_t _state; /**< Which state the Extension is currently in */
std::vector<Dependency *> _deps; /**< Dependencies for this extension */
static std::ofstream error_file; /**< This is the place where errors get reported */
- bool silent;
bool _gui;
protected:
@@ -125,7 +124,6 @@ public:
Inkscape::XML::Node * get_repr ();
gchar * get_id ();
gchar * get_name ();
- bool is_silent ();
void deactivate ();
bool deactivated ();
void printFailure (Glib::ustring reason);