flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-30 05:51:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xbus/plugin.cpp
View File

@@ -5,6 +5,8 @@
#include "plugin.h"
#define XBUS_SERVICE_SERVICENAME "net.vatsim.xbus"
namespace XBus
{
@@ -21,7 +23,7 @@ namespace XBus
Q_ASSERT(! m_server);
for (auto &item : m_startServerMenuItems) { item.setEnabled(false); }
m_server = new BlackCore::CDBusServer(address, this);
m_server = new BlackCore::CDBusServer(XBUS_SERVICE_SERVICENAME, address, this);
m_service = new CService(this);
m_server->addObject(CService::ObjectPath(), m_service);
}

8
src/xbus/service.h
View File

@@ -11,10 +11,10 @@
#include "datarefs.h"
#include <QObject>
//! \private
#define XBUS_SERVICE_INTERFACENAME "net.vatsim.PilotClient.XBus"
//! \private
#define XBUS_SERVICE_OBJECTPATH "/XBus"
//! \cond PRIVATE
#define XBUS_SERVICE_INTERFACENAME "net.vatsim.xbus.service"
#define XBUS_SERVICE_OBJECTPATH "/xbus"
//! \endcond
namespace XBus
{