diff options
| author | Eric Greveson <eric@greveson.co.uk> | 2013-07-03 22:00:06 +0000 |
|---|---|---|
| committer | Eric Greveson <eric@greveson.co.uk> | 2013-07-03 22:00:06 +0000 |
| commit | 1c75594f5c37e86dec195ec1975254315ef180e9 (patch) | |
| tree | a2ef00ceb7bd72b60c61c61ece4dcfe413fac9f5 /src/extension/dbus/application-interface.cpp | |
| parent | Modified dbus interface so that it works in console mode (--dbus-listen) (diff) | |
| download | inkscape-1c75594f5c37e86dec195ec1975254315ef180e9.tar.gz inkscape-1c75594f5c37e86dec195ec1975254315ef180e9.zip | |
Changed dbus interface to treat 'division' like other boolops, with a new
return type for selection_combine to support this (array of string).
This also fixes a bug with not setting the error flag when returning NULL
from this method.
Refactored some more selection verbs to allow use in no-GUI mode.
(bzr r12387.1.5)
Diffstat (limited to 'src/extension/dbus/application-interface.cpp')
| -rw-r--r-- | src/extension/dbus/application-interface.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/extension/dbus/application-interface.cpp b/src/extension/dbus/application-interface.cpp index 399e1b244..1b1dbf0f5 100644 --- a/src/extension/dbus/application-interface.cpp +++ b/src/extension/dbus/application-interface.cpp @@ -150,7 +150,11 @@ gchar* application_interface_get_active_document(ApplicationInterface *object, GError **error) { - return (gchar*)Inkscape::Extension::Dbus::init_active_document(); + gchar *result = (gchar*)Inkscape::Extension::Dbus::init_active_document(); + if (!result) { + g_set_error(error, INKSCAPE_ERROR, INKSCAPE_ERROR_OTHER, "No active document"); + } + return result; } gchar** |