From: Kevron Rees <kevron.m.rees@intel.com>
Date: Sat, 31 Jan 2015 00:28:51 +0000 (-0800)
Subject: manual merge of tripzero/master
X-Git-Tag: accepted/tizen/ivi/20160816.233712~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61d66419b49ba34b6ab369c62fda41519a7f67e5;p=profile%2Fivi%2Fautomotive-message-broker.git

manual merge of tripzero/master
---

61d66419b49ba34b6ab369c62fda41519a7f67e5
diff --cc plugins/common/dbusplugin.cpp
index 6bba358,ea71e91..909a097
--- a/plugins/common/dbusplugin.cpp
+++ b/plugins/common/dbusplugin.cpp
@@@ -23,11 -26,9 +26,11 @@@
  #include "debugout.h"
  #include "listplusplus.h"
  
- DBusSink::DBusSink(string propertyName, AbstractRoutingEngine* engine, GDBusConnection* connection, map<string, string> config)
+ DBusSink::DBusSink(std::string propertyName, AbstractRoutingEngine* engine, GDBusConnection* connection, std::map<std::string, std::string> config)
 +std::map<std::string, std::string> DBusSink::dbusConfig;
 +
  	:AbstractDBusInterface("org.automotive."+propertyName, propertyName, connection),
 -	  AbstractSink(engine, config)
 +	  AbstractSink(engine, dbusConfig)
  {
  	AbstractDBusInterface::re = engine;