fixes #269 added parameter to CDBusServer constructor to choose a different service name,

allows two servers running on the same bus, needed when running xbus and sample_blackcore
This commit is contained in:
Mathew Sutcliffe
2014-06-17 21:20:15 +01:00
parent c4a0207e4f
commit 072667b3b4
6 changed files with 25 additions and 18 deletions

View File

@@ -7,6 +7,8 @@
#include "blackcore/dbus_server.h"
#include <QMetaMethod>
#define XBUS_SERVICE_SERVICENAME "net.vatsim.xbus"
namespace BlackSimPlugin
{
namespace XPlane
@@ -14,7 +16,7 @@ namespace BlackSimPlugin
CXBusServiceProxy::CXBusServiceProxy(QDBusConnection &connection, QObject *parent, bool dummy) : QObject(parent)
{
m_dbusInterface = new BlackMisc::CGenericDBusInterface(BlackCore::CDBusServer::ServiceName, ObjectPath(), InterfaceName(), connection, this);
m_dbusInterface = new BlackMisc::CGenericDBusInterface(XBUS_SERVICE_SERVICENAME, ObjectPath(), InterfaceName(), connection, this);
if (! dummy) { relaySignals(); }
}