diff options
| author | Martin Owens <doctormo@gmail.com> | 2013-07-05 11:28:36 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2013-07-05 11:28:36 +0000 |
| commit | ead55a54d3ca8f822969180cadcb2b14f78aec93 (patch) | |
| tree | 6422564d837d9d4b8aa4762703c9eb8ef2bc44ae /src/widgets/desktop-widget.cpp | |
| parent | Make handle colour a configurable property. (diff) | |
| parent | Fix for builds without --enable-dbusapi (missing #ifdef) (diff) | |
| download | inkscape-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/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 814298041..c1214c1a4 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -41,6 +41,8 @@ #include "ege-select-one-action.h" #include <extension/db.h> #include "file.h" +#include "helper/action.h" +#include "helper/action-context.h" #include "helper/units.h" #include "helper/unit-tracker.h" #include "inkscape-private.h" @@ -485,7 +487,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) gchar const* tip = ""; Inkscape::Verb* verb = Inkscape::Verb::get( SP_VERB_VIEW_CMS_TOGGLE ); if ( verb ) { - SPAction *act = verb->get_action( dtw->viewwidget.view ); + SPAction *act = verb->get_action( Inkscape::ActionContext( dtw->viewwidget.view ) ); if ( act && act->tip ) { tip = act->tip; } @@ -1060,7 +1062,7 @@ void cms_adjust_set_sensitive( SPDesktopWidget *dtw, bool enabled ) { Inkscape::Verb* verb = Inkscape::Verb::get( SP_VERB_VIEW_CMS_TOGGLE ); if ( verb ) { - SPAction *act = verb->get_action( dtw->viewwidget.view ); + SPAction *act = verb->get_action( Inkscape::ActionContext( dtw->viewwidget.view ) ); if ( act ) { sp_action_set_sensitive( act, enabled ); } |