diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2018-11-16 18:23:11 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2018-11-18 12:39:15 +0000 |
| commit | a760d14ec4d4ea8286c0acbaf1c9eb67d993f5cf (patch) | |
| tree | 8b8ac48a8e34fced8e947fa2e7b23e77a4be03e0 | |
| parent | Imlplement '--action-list' command line option. (diff) | |
| download | inkscape-a760d14ec4d4ea8286c0acbaf1c9eb67d993f5cf.tar.gz inkscape-a760d14ec4d4ea8286c0acbaf1c9eb67d993f5cf.zip | |
Fix FTBFS with dbus
| -rw-r--r-- | src/extension/dbus/dbus-init.cpp | 2 | ||||
| -rw-r--r-- | src/extension/dbus/dbus-init.h | 2 | ||||
| -rw-r--r-- | src/inkscape-application.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp index 29db295d7..e74aa7be4 100644 --- a/src/extension/dbus/dbus-init.cpp +++ b/src/extension/dbus/dbus-init.cpp @@ -212,7 +212,7 @@ init_desktop (void) { } void -dbus_set_bus_name(gchar * bus_name) +dbus_set_bus_name(gchar const * bus_name) { g_assert(bus_name != NULL); g_assert(instance_bus_name == NULL); diff --git a/src/extension/dbus/dbus-init.h b/src/extension/dbus/dbus-init.h index c67a97dad..54a2819b1 100644 --- a/src/extension/dbus/dbus-init.h +++ b/src/extension/dbus/dbus-init.h @@ -32,7 +32,7 @@ gchar * dbus_init_desktop_interface (SPDesktop * dt); /** Set the bus name to use. Default is "org.inkscape". This function should only be called once, before init(), if a non-default bus name is required. */ -void dbus_set_bus_name(gchar * bus_name); +void dbus_set_bus_name(gchar const * bus_name); /** Get the bus name for this instance. Default is "org.inkscape". This function should only be called after init(). diff --git a/src/inkscape-application.cpp b/src/inkscape-application.cpp index 668d41289..e03a47044 100644 --- a/src/inkscape-application.cpp +++ b/src/inkscape-application.cpp @@ -22,6 +22,10 @@ #include "desktop.h" // Access to window #include "actions/actions-base.h" // Actions +#ifdef WITH_DBUS +# include "extension/dbus/dbus-init.h" +#endif + #ifdef ENABLE_NLS // Native Language Support - shouldn't this always be used? #include "helper/gettext.h" // gettext init |
