api: change a ConfigurationManager signal
Changed IncomingMessage for IncomingAccountMessage to solve
naming overlapping with one defined in CallManager signal API.
The old name is has been introduced into 2.2.x branch,
this new API will be also.
Refs #72396
Change-Id: I98bd6f1efa7b1c1671d963e353b105131249339f
(cherry picked from commit 5fa08a2e53a7a7fd5cee8e44b095ff13889ad5aa)
diff --git a/bin/dbus/configurationmanager-introspec.xml b/bin/dbus/configurationmanager-introspec.xml
index bb49859..ed24673 100644
--- a/bin/dbus/configurationmanager-introspec.xml
+++ b/bin/dbus/configurationmanager-introspec.xml
@@ -246,10 +246,11 @@
</arg>
</method>
- <signal name="incomingMessage" tp:name-for-bindings="incomingMessage">
- <tp:docstring>
- Notify clients that a new text message has been received at the account level.
- </tp:docstring>
+ <signal name="incomingAccountMessage" tp:name-for-bindings="incomingAccountMessage">
+ <tp:added version="2.2.0"/>
+ <tp:docstring>
+ Notify clients that a new text message has been received at the account level.
+ </tp:docstring>
<arg type="s" name="accountID">
</arg>
<arg type="s" name="from">
diff --git a/bin/dbus/dbusclient.cpp b/bin/dbus/dbusclient.cpp
index 07fd7bf..d5c2df0 100644
--- a/bin/dbus/dbusclient.cpp
+++ b/bin/dbus/dbusclient.cpp
@@ -184,6 +184,7 @@
exportable_callback<ConfigurationSignal::RegistrationStateChanged>(bind(&DBusConfigurationManager::registrationStateChanged, confM, _1, _2, _3, _4)),
exportable_callback<ConfigurationSignal::VolatileDetailsChanged>(bind(&DBusConfigurationManager::volatileAccountDetailsChanged, confM, _1, _2)),
exportable_callback<ConfigurationSignal::Error>(bind(&DBusConfigurationManager::errorAlert, confM, _1)),
+ exportable_callback<ConfigurationSignal::IncomingAccountMessage>(bind(&DBusConfigurationManager::incomingAccountMessage, confM, _1, _2, _3 )),
exportable_callback<ConfigurationSignal::IncomingTrustRequest>(bind(&DBusConfigurationManager::incomingTrustRequest, confM, _1, _2, _3 )),
exportable_callback<ConfigurationSignal::CertificatePinned>(bind(&DBusConfigurationManager::certificatePinned, confM, _1 )),
exportable_callback<ConfigurationSignal::CertificatePathPinned>(bind(&DBusConfigurationManager::certificatePathPinned, confM, _1, _2 )),
diff --git a/src/client/ring_signal.cpp b/src/client/ring_signal.cpp
index 93104d4..96d046b 100644
--- a/src/client/ring_signal.cpp
+++ b/src/client/ring_signal.cpp
@@ -74,6 +74,7 @@
exported_callback<DRing::ConfigurationSignal::CertificatePathPinned>(),
exported_callback<DRing::ConfigurationSignal::CertificateExpired>(),
exported_callback<DRing::ConfigurationSignal::CertificateStateChanged>(),
+ exported_callback<DRing::ConfigurationSignal::IncomingAccountMessage>(),
exported_callback<DRing::ConfigurationSignal::IncomingTrustRequest>(),
exported_callback<DRing::ConfigurationSignal::Error>(),
diff --git a/src/dring/configurationmanager_interface.h b/src/dring/configurationmanager_interface.h
index 2259b95..b3c4540 100644
--- a/src/dring/configurationmanager_interface.h
+++ b/src/dring/configurationmanager_interface.h
@@ -185,8 +185,8 @@
constexpr static const char* name = "VolatileDetailsChanged";
using cb_type = void(const std::string& /*account_id*/, const std::map<std::string, std::string>& /* details */);
};
- struct IncomingMessage {
- constexpr static const char* name = "IncomingMessage";
+ struct IncomingAccountMessage {
+ constexpr static const char* name = "IncomingAccountMessage";
using cb_type = void(const std::string& /*account_id*/, const std::string& /*from*/, const std::string& /*message*/);
};
struct IncomingTrustRequest {