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.
This commit is contained in:
Roland Winklmeier
2015-04-21 23:40:27 +02:00
parent f878b77f0b
commit 01d92f5981
8 changed files with 8 additions and 8 deletions

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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

View File

@@ -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