diff --git a/bin/dbus/configurationmanager-introspec.xml b/bin/dbus/configurationmanager-introspec.xml index bb498596a98671295b3439b3e9707b4568d2c23a..ed246732d8e1f641ced6b82d4896b1f6ab52f7b9 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 07fd7bf81df43365c8fc41534d757c558a3ad7e9..d5c2df0b3c540dc90248cc518d636ef3532ce045 100644 --- a/bin/dbus/dbusclient.cpp +++ b/bin/dbus/dbusclient.cpp @@ -184,6 +184,7 @@ DBusClient::initLibrary(int flags) 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 93104d473ef3e708fac1c1fad88d983dabfb5955..96d046be38fcd347546418e93ff730bb7d0a05a6 100644 --- a/src/client/ring_signal.cpp +++ b/src/client/ring_signal.cpp @@ -74,6 +74,7 @@ getSignalHandlers() 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 2259b95d9fc2317756b778f7590b833facebd37e..b3c4540d2eb7f19e9e437b9459f23c3ab4af972c 100644 --- a/src/dring/configurationmanager_interface.h +++ b/src/dring/configurationmanager_interface.h @@ -185,8 +185,8 @@ struct ConfigurationSignal { 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 {