Skip to content
Snippets Groups Projects
Commit 5fa08a2e authored by Guillaume Roguez's avatar Guillaume Roguez
Browse files

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
parent 42641a7a
No related branches found
No related tags found
No related merge requests found
...@@ -246,7 +246,8 @@ ...@@ -246,7 +246,8 @@
</arg> </arg>
</method> </method>
<signal name="incomingMessage" tp:name-for-bindings="incomingMessage"> <signal name="incomingAccountMessage" tp:name-for-bindings="incomingAccountMessage">
<tp:added version="2.2.0"/>
<tp:docstring> <tp:docstring>
Notify clients that a new text message has been received at the account level. Notify clients that a new text message has been received at the account level.
</tp:docstring> </tp:docstring>
......
...@@ -184,6 +184,7 @@ DBusClient::initLibrary(int flags) ...@@ -184,6 +184,7 @@ DBusClient::initLibrary(int flags)
exportable_callback<ConfigurationSignal::RegistrationStateChanged>(bind(&DBusConfigurationManager::registrationStateChanged, confM, _1, _2, _3, _4)), 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::VolatileDetailsChanged>(bind(&DBusConfigurationManager::volatileAccountDetailsChanged, confM, _1, _2)),
exportable_callback<ConfigurationSignal::Error>(bind(&DBusConfigurationManager::errorAlert, confM, _1)), 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::IncomingTrustRequest>(bind(&DBusConfigurationManager::incomingTrustRequest, confM, _1, _2, _3 )),
exportable_callback<ConfigurationSignal::CertificatePinned>(bind(&DBusConfigurationManager::certificatePinned, confM, _1 )), exportable_callback<ConfigurationSignal::CertificatePinned>(bind(&DBusConfigurationManager::certificatePinned, confM, _1 )),
exportable_callback<ConfigurationSignal::CertificatePathPinned>(bind(&DBusConfigurationManager::certificatePathPinned, confM, _1, _2 )), exportable_callback<ConfigurationSignal::CertificatePathPinned>(bind(&DBusConfigurationManager::certificatePathPinned, confM, _1, _2 )),
......
...@@ -74,6 +74,7 @@ getSignalHandlers() ...@@ -74,6 +74,7 @@ getSignalHandlers()
exported_callback<DRing::ConfigurationSignal::CertificatePathPinned>(), exported_callback<DRing::ConfigurationSignal::CertificatePathPinned>(),
exported_callback<DRing::ConfigurationSignal::CertificateExpired>(), exported_callback<DRing::ConfigurationSignal::CertificateExpired>(),
exported_callback<DRing::ConfigurationSignal::CertificateStateChanged>(), exported_callback<DRing::ConfigurationSignal::CertificateStateChanged>(),
exported_callback<DRing::ConfigurationSignal::IncomingAccountMessage>(),
exported_callback<DRing::ConfigurationSignal::IncomingTrustRequest>(), exported_callback<DRing::ConfigurationSignal::IncomingTrustRequest>(),
exported_callback<DRing::ConfigurationSignal::Error>(), exported_callback<DRing::ConfigurationSignal::Error>(),
......
...@@ -185,8 +185,8 @@ struct ConfigurationSignal { ...@@ -185,8 +185,8 @@ struct ConfigurationSignal {
constexpr static const char* name = "VolatileDetailsChanged"; constexpr static const char* name = "VolatileDetailsChanged";
using cb_type = void(const std::string& /*account_id*/, const std::map<std::string, std::string>& /* details */); using cb_type = void(const std::string& /*account_id*/, const std::map<std::string, std::string>& /* details */);
}; };
struct IncomingMessage { struct IncomingAccountMessage {
constexpr static const char* name = "IncomingMessage"; constexpr static const char* name = "IncomingAccountMessage";
using cb_type = void(const std::string& /*account_id*/, const std::string& /*from*/, const std::string& /*message*/); using cb_type = void(const std::string& /*account_id*/, const std::string& /*from*/, const std::string& /*message*/);
}; };
struct IncomingTrustRequest { struct IncomingTrustRequest {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment