diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-31 15:34:58 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-31 16:03:05 +0000 |
commit | 211e913e0fa78349b230ada3044deea9226a58f4 (patch) | |
tree | c4683c3cd933001279c42b7b665d24fb939759bc | |
parent | 1979e3e99ddb0016d4ad3debe6c0365e3a3f88a1 (diff) |
Rename Account.Valid to Usable, and so on
"Valid" already means something in a lot of APIs.
-rw-r--r-- | spec/Account.xml | 6 | ||||
-rw-r--r-- | spec/Account_Manager.xml | 20 | ||||
-rw-r--r-- | spec/Account_Manager_Interface_Hidden.xml | 24 |
3 files changed, 25 insertions, 25 deletions
diff --git a/spec/Account.xml b/spec/Account.xml index 860f0a2b..0e53c046 100644 --- a/spec/Account.xml +++ b/spec/Account.xml @@ -175,7 +175,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="Valid" tp:name-for-bindings="Valid" + <property name="Usable" tp:name-for-bindings="Usable" type="b" access="read"> <tp:docstring> If true, this account is considered by the account manager to be @@ -597,7 +597,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. non-offline <tp:member-ref>RequestedPresence</tp:member-ref> becomes able to go online (for instance because <tp:member-ref>Enabled</tp:member-ref> or - <tp:member-ref>Valid</tp:member-ref> changes to True), + <tp:member-ref>Usable</tp:member-ref> changes to True), ChangingPresence MUST change to True, and the two property changes MUST be emitted in the same <tp:member-ref>AccountPropertyChanged</tp:member-ref> signal, before the @@ -630,7 +630,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>Re-connect this account. If the account is currently disconnected and the requested presence is offline, or if the account is not <tp:member-ref>Enabled</tp:member-ref> or not - <tp:member-ref>Valid</tp:member-ref>, this does nothing.</p> + <tp:member-ref>Usable</tp:member-ref>, this does nothing.</p> <p>If the account is disconnected and the requested presence is not offline, this forces an attempt to connect with the requested diff --git a/spec/Account_Manager.xml b/spec/Account_Manager.xml index e9dce2b8..c6a7e8a8 100644 --- a/spec/Account_Manager.xml +++ b/spec/Account_Manager.xml @@ -50,13 +50,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="ValidAccounts" type="ao" access="read" - tp:name-for-bindings="Valid_Accounts"> + <property name="UsableAccounts" type="ao" access="read" + tp:name-for-bindings="Usable_Accounts"> <tp:docstring> A list of the valid (complete, usable) <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref>s. Change notification is via - <tp:member-ref>AccountValidityChanged</tp:member-ref>. + <tp:member-ref>AccountUsabilityChanged</tp:member-ref>. <tp:rationale> This split between valid and invalid accounts makes it easy to @@ -67,13 +67,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> - <property name="InvalidAccounts" type="ao" access="read" - tp:name-for-bindings="Invalid_Accounts"> + <property name="UnusableAccounts" type="ao" access="read" + tp:name-for-bindings="Unusable_Accounts"> <tp:docstring> A list of incomplete or otherwise unusable <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref>s. Change notification is via - <tp:member-ref>AccountValidityChanged</tp:member-ref>. + <tp:member-ref>AccountUsabilityChanged</tp:member-ref>. </tp:docstring> </property> @@ -95,8 +95,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> </signal> - <signal name="AccountValidityChanged" - tp:name-for-bindings="Account_Validity_Changed"> + <signal name="AccountUsabilityChanged" + tp:name-for-bindings="Account_Usability_Changed"> <tp:docstring> The validity of the given account has changed. New accounts are also indicated by this signal, as an account validity change @@ -115,7 +115,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </arg> - <arg name="Valid" type="b"> + <arg name="Usable" type="b"> <tp:docstring> True if the account is now valid. </tp:docstring> @@ -153,7 +153,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>Examples of properties that would make no sense here include <tp:dbus-ref - namespace="im.telepathy1.Account">Valid</tp:dbus-ref>, + namespace="im.telepathy1.Account">Usable</tp:dbus-ref>, <tp:dbus-ref namespace="im.telepathy1.Account">Connection</tp:dbus-ref>, <tp:dbus-ref diff --git a/spec/Account_Manager_Interface_Hidden.xml b/spec/Account_Manager_Interface_Hidden.xml index 7617540d..1387e985 100644 --- a/spec/Account_Manager_Interface_Hidden.xml +++ b/spec/Account_Manager_Interface_Hidden.xml @@ -30,26 +30,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> <tp:added version="0.21.10">first draft</tp:added> - <property name="ValidHiddenAccounts" type="ao" access="read" - tp:name-for-bindings="Valid_Hidden_Accounts"> + <property name="UsableHiddenAccounts" type="ao" access="read" + tp:name-for-bindings="Usable_Hidden_Accounts"> <tp:docstring> A list of valid (complete, usable) <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref>s intended exclusively for noninteractive applications. These accounts are not included in <tp:dbus-ref - namespace='imt1'>AccountManager.ValidAccounts</tp:dbus-ref>. Change + namespace='imt1'>AccountManager.UsableAccounts</tp:dbus-ref>. Change notification is via - <tp:member-ref>HiddenAccountValidityChanged</tp:member-ref>. + <tp:member-ref>HiddenAccountUsabilityChanged</tp:member-ref>. </tp:docstring> </property> - <property name="InvalidHiddenAccounts" type="ao" access="read" - tp:name-for-bindings="Invalid_Hidden_Accounts"> + <property name="UnusableHiddenAccounts" type="ao" access="read" + tp:name-for-bindings="Unusable_Hidden_Accounts"> <tp:docstring> A list of incomplete or otherwise unusable <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref>s intended exclusively for noninteractive applications. Change notification is via - <tp:member-ref>HiddenAccountValidityChanged</tp:member-ref>. + <tp:member-ref>HiddenAccountUsabilityChanged</tp:member-ref>. </tp:docstring> </property> @@ -57,8 +57,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Hidden_Account_Removed"> <tp:docstring> The given account has been removed from - <tp:member-ref>ValidHiddenAccounts</tp:member-ref> or - <tp:member-ref>InvalidHiddenAccounts</tp:member-ref>. + <tp:member-ref>UsableHiddenAccounts</tp:member-ref> or + <tp:member-ref>UnusableHiddenAccounts</tp:member-ref>. </tp:docstring> <arg name="Account" type="o"> @@ -68,8 +68,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> </signal> - <signal name="HiddenAccountValidityChanged" - tp:name-for-bindings="Hidden_Account_Validity_Changed"> + <signal name="HiddenAccountUsabilityChanged" + tp:name-for-bindings="Hidden_Account_Usability_Changed"> <tp:docstring> The validity of the given account has changed. New magic accounts are also indicated by this signal, as an account validity @@ -88,7 +88,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </arg> - <arg name="Valid" type="b"> + <arg name="Usable" type="b"> <tp:docstring> True if the account is now valid. </tp:docstring> |