summaryrefslogtreecommitdiffstats
path: root/src/extension/dbus/dbus-init.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-11-26 01:17:02 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-11-26 01:17:02 +0000
commitbed3cc55fe40330718204c540b328d95407b00fa (patch)
treee4269aab0a32957163935ec6b828b25d00613d68 /src/extension/dbus/dbus-init.cpp
parentAdd CMake file to find LCMS2 (diff)
parentUpdate to trunk r13766 (diff)
downloadinkscape-bed3cc55fe40330718204c540b328d95407b00fa.tar.gz
inkscape-bed3cc55fe40330718204c540b328d95407b00fa.zip
Merge inkscape-cppify branch
(bzr r13767)
Diffstat (limited to 'src/extension/dbus/dbus-init.cpp')
-rw-r--r--src/extension/dbus/dbus-init.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp
index 19b48e10d..43830762c 100644
--- a/src/extension/dbus/dbus-init.cpp
+++ b/src/extension/dbus/dbus-init.cpp
@@ -153,23 +153,23 @@ gchar *
init_document (void)
{
// This is for command-line use only
- g_assert(!inkscape_use_gui());
+ g_assert(!INKSCAPE.use_gui());
// Create a blank document and get its selection model etc in an ActionContext
SPDocument *doc = SPDocument::createNewDoc(NULL, 1, TRUE);
- inkscape_add_document(doc);
- return dbus_register_document(inkscape_action_context_for_document(doc));
+ INKSCAPE.add_document(doc);
+ return dbus_register_document(INKSCAPE.action_context_for_document(doc));
}
gchar *
init_active_document()
{
- SPDocument *doc = inkscape_active_document();
+ SPDocument *doc = INKSCAPE.active_document();
if (!doc) {
return NULL;
}
- return dbus_register_document(inkscape_active_action_context());
+ return dbus_register_document(INKSCAPE.active_action_context());
}
gchar *