manual merge of tripzero/master

diff --cc plugins/common/dbusplugin.cpp
index 641a5ce,241dc13..6bba358
--- 1/plugins/common/dbusplugin.cpp
--- 2/plugins/dbus/dbusplugin.cpp
+++ b/plugins/common/dbusplugin.cpp
@@@ -23,9 -23,17 +23,11 @@@
  #include "debugout.h"
  #include "listplusplus.h"
  
 -extern "C" AbstractSinkManager * create(AbstractRoutingEngine* routingengine, map<string, string> config)
 -{
 -      return new DBusSinkManager(routingengine, config);
 -}
 -
 +DBusSink::DBusSink(string propertyName, AbstractRoutingEngine* engine, GDBusConnection* connection, map<string, string> config)
+ std::map<std::string, std::string> DBusSink::dbusConfig;
+ 
 -DBusSink::DBusSink(string propertyName, AbstractRoutingEngine* engine, GDBusConnection* connection, map<string, string> config = map<string, string>())
        :AbstractDBusInterface("org.automotive."+propertyName, propertyName, connection),
-         AbstractSink(engine, config)
+         AbstractSink(engine, dbusConfig)
  {
        AbstractDBusInterface::re = engine;
  

diff --cc plugins/common/dbusplugin.h
index f71c782,9440e74..21fa5fd
--- 1/plugins/common/dbusplugin.h
--- 2/plugins/dbus/dbusplugin.h
+++ b/plugins/common/dbusplugin.h
@@@ -29,8 -31,9 +29,9 @@@ class DBusSink : public AbstractSink, p
  {
  
  public:
 -      DBusSink(std::string objectName, AbstractRoutingEngine* engine, GDBusConnection* connection, map<string, string> config);
 +      DBusSink(std::string objectName, AbstractRoutingEngine* engine, GDBusConnection* connection, map<string, string> config = std::map<std::string, std::string>());
-       virtual ~DBusSink() {
+       virtual ~DBusSink()
+       {
                for(auto i : propertyDBusMap)
                {
                        delete i;

diff --cc plugins/dbus/dbusinterfacemanager.cpp
index cc92912,e17800c..4006d50
--- 1/plugins/dbus/dbusinterfacemanager.cpp
--- 2/plugins/dbus/dbusinterfacemanager.cpp
+++ b/plugins/dbus/dbusinterfacemanager.cpp
@@@ -86,11 -155,10 +86,12 @@@ on_name_lost (GDBusConnection *connecti
  
  
  
 -DBusInterfaceManager::DBusInterfaceManager(AbstractRoutingEngine* engine,std::map<std::string,std::string> config)
 -      :AbstractSink(engine,config),re(engine), connection(nullptr)
 +DBusInterfaceManager::DBusInterfaceManager(AbstractRoutingEngine * engine, std::map<std::string,std::string> config, AbstractSource & parent)
 +      :AmbPluginImpl(engine, config, parent), connection(nullptr)
  {
+       DBusSink::dbusConfig = config;
 +      dbusConnected = addPropertySupport(Zone::None, []() { return new BasicPropertyType<bool>(DBusConnected, false); });
 +
        ownerId = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                                         DBusServiceName,
                                                         G_BUS_NAME_OWNER_FLAGS_NONE,