summaryrefslogtreecommitdiffstats
path: root/src/extension/dbus/wrapper
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2011-03-18 20:29:06 +0000
committerJazzyNico <nicoduf@yahoo.fr>2011-03-18 20:29:06 +0000
commit2de761f0c46b4f3164d0dc008320da3ad0f35316 (patch)
treefbf8c57ade340c7e2b639adc2269e5063d90c6e4 /src/extension/dbus/wrapper
parentLayers. Fix for Bug #249035: Undo crash when executing extensions. (diff)
downloadinkscape-2de761f0c46b4f3164d0dc008320da3ad0f35316.tar.gz
inkscape-2de761f0c46b4f3164d0dc008320da3ad0f35316.zip
D-Bus. Merging branch lp:~joakim-verona/inkscape/dbus-fixes (Bug #666986, Bug #707054 and Bug #707364).
(bzr r10114)
Diffstat (limited to 'src/extension/dbus/wrapper')
-rw-r--r--src/extension/dbus/wrapper/inkscape-dbus-wrapper.c6
-rw-r--r--src/extension/dbus/wrapper/inkscape-dbus-wrapper.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c
index b59ee746b..7a33d4f38 100644
--- a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c
+++ b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c
@@ -198,11 +198,13 @@ inkscape_line (DocumentInterface *doc, const gint IN_x, const gint IN_y, const g
}
//static
-gboolean
+char *
inkscape_text (DocumentInterface *doc, const gint IN_x, const gint IN_y, const char * IN_text, GError **error)
{
+ char * OUT_object_name;
DBusGProxy *proxy = doc->proxy;
- return org_inkscape_document_text (proxy, IN_x, IN_y, IN_text, error);
+ org_inkscape_document_text (proxy, IN_x, IN_y, IN_text, &OUT_object_name, error);
+ return OUT_object_name;
}
//static
diff --git a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.h b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.h
index c314bf6f8..684f1b142 100644
--- a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.h
+++ b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.h
@@ -72,7 +72,7 @@ char *
inkscape_line (DocumentInterface *doc, const gint IN_x, const gint IN_y, const gint IN_x2, const gint IN_y2, GError **error);
//static
-gboolean
+char *
inkscape_text (DocumentInterface *doc, const gint IN_x, const gint IN_y, const char * IN_text, GError **error);
//static