diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml index d7122b934fd4f5f753201380183b056f3e1556d4..6f693e193d88c0f477189a225f55af934a03f1d2 100644 --- a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml +++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml @@ -874,6 +874,20 @@ <signal name="accountsChanged" tp:name-for-bindings="accountsChanged"> </signal> + <signal name="accountDetailsChanged" tp:name-for-bindings="accountDetailsChanged"> + <arg type="s" name="accountID"> + <tp:docstring> + The account ID + </tp:docstring> + </arg> + <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringString"/> + <arg type="a{ss}" name="details" tp:type="String_String_Map"> + <tp:docstring> + New persistent account details + </tp:docstring> + </arg> + </signal> + <signal name="registrationStateChanged" tp:name-for-bindings="registrationStateChanged"> <arg type="s" name="accountID"/> <arg type="s" name="registrationState"/> diff --git a/bin/dbus/dbusclient.cpp b/bin/dbus/dbusclient.cpp index 152a69a2fcd0b2f8914decfdb942691b9a5cc683..e13b4c681d7a386fe2f58e327b6fa5aa38a5ea4d 100644 --- a/bin/dbus/dbusclient.cpp +++ b/bin/dbus/dbusclient.cpp @@ -172,6 +172,7 @@ DBusClient::initLibrary(int flags) const std::map<std::string, SharedCallback> configEvHandlers = { exportable_callback<ConfigurationSignal::VolumeChanged>(bind(&DBusConfigurationManager::volumeChanged, confM, _1, _2)), exportable_callback<ConfigurationSignal::AccountsChanged>(bind(&DBusConfigurationManager::accountsChanged, confM)), + exportable_callback<ConfigurationSignal::AccountDetailsChanged>(bind(&DBusConfigurationManager::accountDetailsChanged, confM, _1, _2)), exportable_callback<ConfigurationSignal::StunStatusFailed>(bind(&DBusConfigurationManager::stunStatusFailure, confM, _1)), exportable_callback<ConfigurationSignal::RegistrationStateChanged>(bind(&DBusConfigurationManager::registrationStateChanged, confM, _1, _2, _3, _4)), exportable_callback<ConfigurationSignal::VolatileDetailsChanged>(bind(&DBusConfigurationManager::volatileAccountDetailsChanged, confM, _1, _2)), diff --git a/configure.ac b/configure.ac index 8d244e24b827d0631a4a52b08ad1851b689bcc3b..4365a1a6b9e60560708c9928af4bbd06ec3126a7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Ring - configure.ac for automake 1.9 and autoconf 2.59 dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) -AC_INIT([Ring Daemon],[4.2.0],[ring@gnu.org],[ring]) +AC_INIT([Ring Daemon],[4.3.0],[ring@gnu.org],[ring]) AC_COPYRIGHT([[Copyright (c) Savoir-faire Linux 2004-2018]]) AC_REVISION([$Revision$]) diff --git a/doc/doxygen/core-doc.cfg.in b/doc/doxygen/core-doc.cfg.in index 50a752648f29dbd8b24b7a23ee88e3c076faccc5..2e72e5966220152191469acc25cd2456e7dd7c9b 100644 --- a/doc/doxygen/core-doc.cfg.in +++ b/doc/doxygen/core-doc.cfg.in @@ -31,7 +31,7 @@ PROJECT_NAME = "Ring Daemon" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 4.2.0 +PROJECT_NUMBER = 4.3.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/src/client/ring_signal.cpp b/src/client/ring_signal.cpp index 65175ed0341489f324c1339626f06373caba7c0f..b9343f58b3bbd98393f1a12283af19cb05aa9b31 100644 --- a/src/client/ring_signal.cpp +++ b/src/client/ring_signal.cpp @@ -53,6 +53,7 @@ getSignalHandlers() /* Configuration */ exported_callback<DRing::ConfigurationSignal::VolumeChanged>(), exported_callback<DRing::ConfigurationSignal::AccountsChanged>(), + exported_callback<DRing::ConfigurationSignal::AccountDetailsChanged>(), exported_callback<DRing::ConfigurationSignal::StunStatusFailed>(), exported_callback<DRing::ConfigurationSignal::RegistrationStateChanged>(), exported_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>(), diff --git a/src/dring/configurationmanager_interface.h b/src/dring/configurationmanager_interface.h index 3021b74e3915c7947daf9cf8e42e2da0c1754136..3e78409a4a8d06956883943f8e6d091f24848361 100644 --- a/src/dring/configurationmanager_interface.h +++ b/src/dring/configurationmanager_interface.h @@ -223,6 +223,10 @@ struct ConfigurationSignal { }; // TODO: move those to AccountSignal in next API breakage + struct AccountDetailsChanged { + constexpr static const char* name = "AccountDetailsChanged"; + using cb_type = void(const std::string& /*account_id*/, const std::map<std::string, std::string>& /* details */); + }; struct StunStatusFailed { constexpr static const char* name = "StunStatusFailed"; using cb_type = void(const std::string& /*account_id*/); diff --git a/src/manager.cpp b/src/manager.cpp index a8a1eb4567d552349abd033b15819b1075d4c025..d2adddece072975eb96bda2087139abf62dcc03c 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -2653,6 +2653,9 @@ Manager::setAccountDetails(const std::string& accountID, account->doRegister(); else account->doUnregister(); + + // Update account details to the client side + emitSignal<DRing::ConfigurationSignal::AccountDetailsChanged>(accountID, details); }); }