From 01d92f5981c4b32d0d317e92899016bceec1ec70 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Tue, 21 Apr 2015 23:40:27 +0200 Subject: [PATCH] refs #408 Fix DBus interface names to contain only legal characters The DBus specification allows only ASCII characters "[A-Z][a-z][0-9]_". Dash is illegal and therefore libdbus is complaining about our interface names not being valid. --- src/blackcore/context_application.h | 2 +- src/blackcore/context_audio.h | 2 +- src/blackcore/context_network.h | 2 +- src/blackcore/context_ownaircraft.h | 2 +- src/blackcore/context_settings.h | 2 +- src/blackcore/context_simulator.h | 2 +- src/xbus/service.h | 2 +- src/xbus/traffic.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/blackcore/context_application.h b/src/blackcore/context_application.h index bfe987690..8783452b5 100644 --- a/src/blackcore/context_application.h +++ b/src/blackcore/context_application.h @@ -24,7 +24,7 @@ //! @{ //! DBus interface for context -#define BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift-project.blackcore.contextapplication" +#define BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift_project.blackcore.contextapplication" //! DBus object path for context #define BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH "/application" diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index c0ad0afa5..05d504f36 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -26,7 +26,7 @@ //! @{ //! DBus interface for context -#define BLACKCORE_CONTEXTAUDIO_INTERFACENAME "org.swift-project.blackcore.contextaudio" +#define BLACKCORE_CONTEXTAUDIO_INTERFACENAME "org.swift_project.blackcore.contextaudio" //! DBus object path for context #define BLACKCORE_CONTEXTAUDIO_OBJECTPATH "/audio" diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 89bfb199a..6b917ab80 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -27,7 +27,7 @@ //! @{ //! DBus interface for context -#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "org.swift-project.blackcore.contextnetwork" +#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "org.swift_project.blackcore.contextnetwork" //! DBus object path for context #define BLACKCORE_CONTEXTNETWORK_OBJECTPATH "/network" diff --git a/src/blackcore/context_ownaircraft.h b/src/blackcore/context_ownaircraft.h index 05e039018..1d5e31567 100644 --- a/src/blackcore/context_ownaircraft.h +++ b/src/blackcore/context_ownaircraft.h @@ -22,7 +22,7 @@ //! @{ //! DBus interface for context -#define BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift-project.blackcore.contextownaircraft" +#define BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift_project.blackcore.contextownaircraft" //! DBus object path for context #define BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH "/ownaircraft" diff --git a/src/blackcore/context_settings.h b/src/blackcore/context_settings.h index ded136b32..e01c39d93 100644 --- a/src/blackcore/context_settings.h +++ b/src/blackcore/context_settings.h @@ -26,7 +26,7 @@ //! @{ //! DBus interface for context -#define BLACKCORE_CONTEXTSETTINGS_INTERFACENAME "org.swift-project.blackcore.contextsettings" +#define BLACKCORE_CONTEXTSETTINGS_INTERFACENAME "org.swift_project.blackcore.contextsettings" //! DBus object path for context #define BLACKCORE_CONTEXTSETTINGS_OBJECTPATH "/settings" diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h index 2993d02b0..753a047af 100644 --- a/src/blackcore/context_simulator.h +++ b/src/blackcore/context_simulator.h @@ -16,7 +16,7 @@ //! @{ //! DBus interface for context -#define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift-project.blackcore.contextsimulator" +#define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift_project.blackcore.contextsimulator" //! DBus object path for context #define BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH "/simulator" diff --git a/src/xbus/service.h b/src/xbus/service.h index 9a7ba8385..a5268d75c 100644 --- a/src/xbus/service.h +++ b/src/xbus/service.h @@ -21,7 +21,7 @@ class QTimer; //! \cond PRIVATE -#define XBUS_SERVICE_INTERFACENAME "org.swift-project.xbus.service" +#define XBUS_SERVICE_INTERFACENAME "org.swift_project.xbus.service" #define XBUS_SERVICE_OBJECTPATH "/xbus" //! \endcond diff --git a/src/xbus/traffic.h b/src/xbus/traffic.h index b22cb3495..57dcbccef 100644 --- a/src/xbus/traffic.h +++ b/src/xbus/traffic.h @@ -14,7 +14,7 @@ #include "XPMPMultiplayer.h" //! \cond PRIVATE -#define XBUS_TRAFFIC_INTERFACENAME "org.swift-project.xbus.traffic" +#define XBUS_TRAFFIC_INTERFACENAME "org.swift_project.xbus.traffic" #define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic" //! \endcond