From a9771fa406089c5c8b032e558afb84108d078c51 Mon Sep 17 00:00:00 2001 From: "Johannes Schanda (qxb7952)" Date: Mon, 3 Sep 2012 13:26:12 +0200 Subject: Fix for commit bf5814ff3aa87fde46904a747a7108ea458f063e, signals now send on correct interface Signed-off-by: christian mueller --- PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp | 5 +++-- PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp index f19d2fa..d577ad8 100644 --- a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp +++ b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp @@ -76,8 +76,9 @@ void CAmDbusMessageHandler::initSignal(std::string path, std::string signalName) { assert(!path.empty()); assert(!signalName.empty()); - std::string completePath = std::string(DBUS_SERVICE_OBJECT_PATH) + "/" + path+ MY_NODE; - mpDBusMessage = dbus_message_new_signal(completePath.c_str(), DBUS_SERVICE_PREFIX, signalName.c_str()); + std::string completePath = std::string(DBUS_SERVICE_OBJECT_PATH) + "/" + path; + std::string completeInterface = std::string(DBUS_SERVICE_PREFIX) + "." + MY_NODE; + mpDBusMessage = dbus_message_new_signal(completePath.c_str(), completeInterface.c_str(), signalName.c_str()); if (mpDBusMessage == NULL) { diff --git a/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp index 8c61c12..d7b65d2 100644 --- a/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp +++ b/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp @@ -78,8 +78,9 @@ void CAmRoutingDbusMessageHandler::initSignal(std::string path, std::string sign { assert(!path.empty()); assert(!signalName.empty()); - std::string completePath = std::string(DBUS_SERVICE_OBJECT_PATH) + "/" + path + ROUTING_NODE; - mpDBusMessage = dbus_message_new_signal(completePath.c_str(), DBUS_SERVICE_PREFIX, signalName.c_str()); + std::string completePath = std::string(DBUS_SERVICE_OBJECT_PATH) + "/" + path; + std::string completeInterface = std::string(DBUS_SERVICE_PREFIX) + "." + ROUTING_NODE; + mpDBusMessage = dbus_message_new_signal(completePath.c_str(), completeInterface.c_str(), signalName.c_str()); if (mpDBusMessage == NULL) { -- cgit v1.2.1