diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-07-05 15:46:24 +0000 |
|---|---|---|
| committer | Javiertxo <jtx@jtx.marker.es> | 2013-07-05 15:46:24 +0000 |
| commit | c0503c1a2b9a5f7a4030a664ca5a324ce38c967a (patch) | |
| tree | 9bc6d203a70155251a7a50210abe236cc2277d11 /src/extension/effect.cpp | |
| parent | Upadate to trunk (diff) | |
| parent | Merge: Command-line and DBus refactoring to improve inkscapes ability to be r... (diff) | |
| download | inkscape-c0503c1a2b9a5f7a4030a664ca5a324ce38c967a.tar.gz inkscape-c0503c1a2b9a5f7a4030a664ca5a324ce38c967a.zip | |
Update to trunk
(bzr r11950.1.123)
Diffstat (limited to 'src/extension/effect.cpp')
| -rw-r--r-- | src/extension/effect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp index 1df8002ad..dcccf3d7d 100644 --- a/src/extension/effect.cpp +++ b/src/extension/effect.cpp @@ -359,22 +359,22 @@ Effect::set_pref_dialog (PrefDialog * prefdialog) } SPAction * -Effect::EffectVerb::make_action (Inkscape::UI::View::View * view) +Effect::EffectVerb::make_action (Inkscape::ActionContext const & context) { - return make_action_helper(view, &perform, static_cast<void *>(this)); + return make_action_helper(context, &perform, static_cast<void *>(this)); } /** \brief Decode the verb code and take appropriate action */ void Effect::EffectVerb::perform( SPAction *action, void * data ) { + g_return_if_fail(ensure_desktop_valid(action)); Inkscape::UI::View::View * current_view = sp_action_get_view(action); -// SPDocument * current_document = current_view->doc; + Effect::EffectVerb * ev = reinterpret_cast<Effect::EffectVerb *>(data); Effect * effect = ev->_effect; if (effect == NULL) return; - if (current_view == NULL) return; if (ev->_showPrefs) { effect->prefs(current_view); |