diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
| commit | 945ce419c806c73d70203dec33ececafbe108a92 (patch) | |
| tree | cfcdb59bf47e9db7f9e01f7eebb59924bdeaea94 /src/extension/dbus/dbus-init.cpp | |
| parent | Merge from trunk (again) (diff) | |
| parent | Extensions. SVG+media fix (see Bug #400356). (diff) | |
| download | inkscape-945ce419c806c73d70203dec33ececafbe108a92.tar.gz inkscape-945ce419c806c73d70203dec33ececafbe108a92.zip | |
Merge from trunk
(bzr r9508.1.73)
Diffstat (limited to 'src/extension/dbus/dbus-init.cpp')
| -rw-r--r-- | src/extension/dbus/dbus-init.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp index 253d6b938..3e453d048 100644 --- a/src/extension/dbus/dbus-init.cpp +++ b/src/extension/dbus/dbus-init.cpp @@ -14,6 +14,8 @@ */ #include <dbus/dbus-glib.h> +// this is reguired so that giomm headers won't barf +#undef DBUS_MESSAGE_TYPE_INVALID #include "dbus-init.h" #include "application-interface.h" @@ -84,7 +86,6 @@ init (void) GError *error = NULL; DBusGConnection *connection; DBusGProxy *proxy; - DocumentInterface *obj; connection = dbus_get_connection(); proxy = dbus_get_proxy(connection); org_freedesktop_DBus_request_name (proxy, @@ -100,16 +101,14 @@ init (void) gchar * init_document (void) { - guint result; - GError *error = NULL; DBusGConnection *connection; DBusGProxy *proxy; SPDocument *doc; - doc = sp_document_new(NULL, 1, TRUE); + doc = SPDocument::createNewDoc(NULL, 1, TRUE); std::string name("/org/inkscape/"); - name.append(doc->name); + name.append(doc->getName()); std::replace(name.begin(), name.end(), ' ', '_'); connection = dbus_get_connection(); |