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/wrapper | |
| 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/wrapper')
| -rw-r--r-- | src/extension/dbus/wrapper/inkscape-dbus-wrapper.c | 18 | ||||
| -rw-r--r-- | src/extension/dbus/wrapper/inkscape-dbus-wrapper.h | 6 |
2 files changed, 5 insertions, 19 deletions
diff --git a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c index 0be1be42e..c7e453593 100644 --- a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c +++ b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c @@ -688,23 +688,13 @@ inkscape_selection_to_path (DocumentInterface *doc, GError **error) } //static -char * -inkscape_selection_combine (DocumentInterface *doc, const char * IN_type, GError **error) -{ - char * OUT_newpath; - DBusGProxy *proxy = doc->proxy; - org_inkscape_document_selection_combine (proxy, IN_type, &OUT_newpath, error); - return OUT_newpath; -} - -//static char ** -inkscape_selection_divide (DocumentInterface *doc, GError **error) +inkscape_selection_combine (DocumentInterface *doc, const char * IN_type, GError **error) { - char ** OUT_pieces; + char ** OUT_newpaths; DBusGProxy *proxy = doc->proxy; - org_inkscape_document_selection_divide (proxy, &OUT_pieces, error); - return OUT_pieces; + org_inkscape_document_selection_combine (proxy, IN_type, &OUT_newpaths, error); + return OUT_newpaths; } //static diff --git a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.h b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.h index 684f1b142..79f8188d4 100644 --- a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.h +++ b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.h @@ -304,12 +304,8 @@ gboolean inkscape_selection_to_path (DocumentInterface *doc, GError **error); //static -char * -inkscape_selection_combine (DocumentInterface *doc, const char * IN_type, GError **error); - -//static char ** -inkscape_selection_divide (DocumentInterface *doc, GError **error); +inkscape_selection_combine (DocumentInterface *doc, const char * IN_type, GError **error); //static gboolean |