From bf656194400b790391fc238dc660ffb6dadbc2fb Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Wed, 10 Feb 2016 01:48:50 +0100 Subject: [PATCH] Fix duplicate DBus object path in xbus --- src/plugins/simulator/xplane/xbusserviceproxy.h | 2 +- src/plugins/simulator/xplane/xbusweatherproxy.h | 2 +- src/xbus/service.h | 2 +- src/xbus/weather.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/simulator/xplane/xbusserviceproxy.h b/src/plugins/simulator/xplane/xbusserviceproxy.h index 52c4012f1..044db66c0 100644 --- a/src/plugins/simulator/xplane/xbusserviceproxy.h +++ b/src/plugins/simulator/xplane/xbusserviceproxy.h @@ -18,7 +18,7 @@ //! \cond PRIVATE #define XBUS_SERVICE_INTERFACENAME "org.swift_project.xbus.service" -#define XBUS_SERVICE_OBJECTPATH "/xbus" +#define XBUS_SERVICE_OBJECTPATH "/xbus/service" //! \endcond namespace BlackSimPlugin diff --git a/src/plugins/simulator/xplane/xbusweatherproxy.h b/src/plugins/simulator/xplane/xbusweatherproxy.h index 7c03e37b6..dbfb014d7 100644 --- a/src/plugins/simulator/xplane/xbusweatherproxy.h +++ b/src/plugins/simulator/xplane/xbusweatherproxy.h @@ -16,7 +16,7 @@ //! \cond PRIVATE #define XBUS_WEATHER_INTERFACENAME "org.swift_project.xbus.weather" -#define XBUS_WEATHER_OBJECTPATH "/xbus" +#define XBUS_WEATHER_OBJECTPATH "/xbus/weather" //! \endcond namespace BlackSimPlugin diff --git a/src/xbus/service.h b/src/xbus/service.h index 94db7ae05..b0867e652 100644 --- a/src/xbus/service.h +++ b/src/xbus/service.h @@ -27,7 +27,7 @@ class QTimer; //! \cond PRIVATE #define XBUS_SERVICE_INTERFACENAME "org.swift_project.xbus.service" -#define XBUS_SERVICE_OBJECTPATH "/xbus" +#define XBUS_SERVICE_OBJECTPATH "/xbus/service" //! \endcond //! Typedef needed to use QList as a DBus argument diff --git a/src/xbus/weather.h b/src/xbus/weather.h index e1e6b739a..4e69b8ccf 100644 --- a/src/xbus/weather.h +++ b/src/xbus/weather.h @@ -20,7 +20,7 @@ //! \cond PRIVATE #define XBUS_WEATHER_INTERFACENAME "org.swift_project.xbus.weather" -#define XBUS_WEATHER_OBJECTPATH "/xbus" +#define XBUS_WEATHER_OBJECTPATH "/xbus/weather" //! \endcond namespace XBus