summaryrefslogtreecommitdiffstats
path: root/src/extension/internal
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2013-07-05 11:28:36 +0000
committerMartin Owens <doctormo@gmail.com>2013-07-05 11:28:36 +0000
commitead55a54d3ca8f822969180cadcb2b14f78aec93 (patch)
tree6422564d837d9d4b8aa4762703c9eb8ef2bc44ae /src/extension/internal
parentMake handle colour a configurable property. (diff)
parentFix for builds without --enable-dbusapi (missing #ifdef) (diff)
downloadinkscape-ead55a54d3ca8f822969180cadcb2b14f78aec93.tar.gz
inkscape-ead55a54d3ca8f822969180cadcb2b14f78aec93.zip
Merge: Command-line and DBus refactoring to improve inkscapes ability to be run headless.
(bzr r12402)
Diffstat (limited to 'src/extension/internal')
-rw-r--r--src/extension/internal/bluredge.cpp5
-rw-r--r--[-rwxr-xr-x]src/extension/internal/filter/filter-all.cpp0
2 files changed, 3 insertions, 2 deletions
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 8f1e07211..a3d2fd6e5 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -17,6 +17,7 @@
#include "document.h"
#include "selection.h"
#include "helper/action.h"
+#include "helper/action-context.h"
#include "preferences.h"
#include "path-chemistry.h"
#include "sp-item.h"
@@ -99,10 +100,10 @@ BlurEdge::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View
/* Doing an inset here folks */
offset *= -1.0;
prefs->setDoubleUnit("/options/defaultoffsetwidth/value", offset, "px");
- sp_action_perform(Inkscape::Verb::get(SP_VERB_SELECTION_INSET)->get_action(desktop), NULL);
+ sp_action_perform(Inkscape::Verb::get(SP_VERB_SELECTION_INSET)->get_action(Inkscape::ActionContext(desktop)), NULL);
} else if (offset > 0.0) {
prefs->setDoubleUnit("/options/defaultoffsetwidth/value", offset, "px");
- sp_action_perform(Inkscape::Verb::get(SP_VERB_SELECTION_OFFSET)->get_action(desktop), NULL);
+ sp_action_perform(Inkscape::Verb::get(SP_VERB_SELECTION_OFFSET)->get_action(Inkscape::ActionContext(desktop)), NULL);
}
selection->clear();
diff --git a/src/extension/internal/filter/filter-all.cpp b/src/extension/internal/filter/filter-all.cpp
index 0273d1669..0273d1669 100755..100644
--- a/src/extension/internal/filter/filter-all.cpp
+++ b/src/extension/internal/filter/filter-all.cpp