From cba86c020723b8f31674144e62d9aa9ffd3b3d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 19 Mar 2015 18:15:01 -0400
Subject: [PATCH] api: send registration state as a string
Refs #68913
Change-Id: I04e49a947740487f312f701dd2c7920a267639db
---
daemon/bin/dbus/configurationmanager-introspec.xml | 2 +-
daemon/src/account.cpp | 2 +-
daemon/src/dring/configurationmanager_interface.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/bin/dbus/configurationmanager-introspec.xml b/daemon/bin/dbus/configurationmanager-introspec.xml
index a78f2a20fb..80384a45df 100644
--- a/daemon/bin/dbus/configurationmanager-introspec.xml
+++ b/daemon/bin/dbus/configurationmanager-introspec.xml
@@ -532,7 +532,7 @@
<signal name="registrationStateChanged" tp:name-for-bindings="registrationStateChanged">
<arg type="s" name="accountID"/>
- <arg type="i" name="registrationState"/>
+ <arg type="s" name="registrationState"/>
<arg type="i" name="registrationDetail">
<tp:docstring>
The optional account-type specific message code. 0 when not available.
diff --git a/daemon/src/account.cpp b/daemon/src/account.cpp
index 33050a61b9..2b8c16bb91 100644
--- a/daemon/src/account.cpp
+++ b/daemon/src/account.cpp
@@ -153,7 +153,7 @@ Account::setRegistrationState(RegistrationState state, unsigned detail_code, con
// Notify the client
emitSignal<DRing::ConfigurationSignal::RegistrationStateChanged>(
accountID_,
- static_cast<int32_t>(registrationState_),
+ mapStateNumberToString(registrationState_),
detail_code,
detail_str);
diff --git a/daemon/src/dring/configurationmanager_interface.h b/daemon/src/dring/configurationmanager_interface.h
index 0c92f6069f..5bf2c7d49c 100644
--- a/daemon/src/dring/configurationmanager_interface.h
+++ b/daemon/src/dring/configurationmanager_interface.h
@@ -154,7 +154,7 @@ struct ConfigurationSignal {
};
struct RegistrationStateChanged {
constexpr static const char* name = "RegistrationStateChanged";
- using cb_type = void(const std::string& /*account_id*/, int /*state*/, int /*detailsCode*/, const std::string& /*detailsStr*/);
+ using cb_type = void(const std::string& /*account_id*/, const std::string& /*state*/, int /*detailsCode*/, const std::string& /*detailsStr*/);
};
struct VolatileDetailsChanged {
constexpr static const char* name = "VolatileDetailsChanged";
--
GitLab