summaryrefslogtreecommitdiffstats
path: root/src/path-chemistry.cpp
diff options
context:
space:
mode:
authorEric Greveson <eric@greveson.co.uk>2013-08-12 15:39:48 +0000
committerEric Greveson <eric@greveson.co.uk>2013-08-12 15:39:48 +0000
commit05f008356889de30ff55df1f73030003ed7cc312 (patch)
tree32fadd87a5507b108c457db4da40d963c5c7b7e4 /src/path-chemistry.cpp
parentPackaging. Hebrew translation by Yaron Shahrabani. (diff)
downloadinkscape-05f008356889de30ff55df1f73030003ed7cc312.tar.gz
inkscape-05f008356889de30ff55df1f73030003ed7cc312.zip
Allow Object to Path verb from non-GUI (DBus) interface
(bzr r12473.1.1)
Diffstat (limited to 'src/path-chemistry.cpp')
-rw-r--r--src/path-chemistry.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index b192904ce..e1924664b 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -294,18 +294,16 @@ sp_selected_path_break_apart(SPDesktop *desktop)
/* This function is an entry point from GUI */
void
-sp_selected_path_to_curves(SPDesktop *desktop, bool interactive)
+sp_selected_path_to_curves(Inkscape::Selection *selection, SPDesktop *desktop, bool interactive)
{
- Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
if (selection->isEmpty()) {
- if (interactive)
+ if (interactive && desktop)
sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to convert to path."));
return;
}
bool did = false;
- if (interactive) {
+ if (interactive && desktop) {
desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Converting objects to paths..."));
// set "busy" cursor
desktop->setWaitingCursor();
@@ -324,7 +322,7 @@ sp_selected_path_to_curves(SPDesktop *desktop, bool interactive)
g_slist_free (to_select);
g_slist_free (selected);
- if (interactive) {
+ if (interactive && desktop) {
desktop->clearWaitingCursor();
if (did) {
DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_OBJECT_TO_CURVE,