From 9675ce7fb58f2ebb50c1388ae3c4f96392935f7a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 27 Sep 2013 18:03:15 +0100 Subject: [PATCH 18/22] Upgrade to the Hidden1 interface from telepathy-spec 0.99.2 In a future version we should make telepathy-glib generate this interface, but this will do for now. --- src/Makefile.am | 12 ++-- src/mcd-account-manager-priv.h | 2 +- src/mcd-account-manager.c | 4 +- src/mcd-account-priv.h | 2 +- src/mcd-account.c | 2 +- src/mcd.xml | 4 +- xml/Account_Interface_Hidden.xml | 65 ------------------- xml/Account_Interface_Hidden1.xml | 65 +++++++++++++++++++ xml/Account_Manager_Interface_Hidden.xml | 100 ------------------------------ xml/Account_Manager_Interface_Hidden1.xml | 100 ++++++++++++++++++++++++++++++ xml/Makefile.am | 4 +- xml/nmc5.xml | 4 +- 12 files changed, 182 insertions(+), 182 deletions(-) delete mode 100644 xml/Account_Interface_Hidden.xml create mode 100644 xml/Account_Interface_Hidden1.xml delete mode 100644 xml/Account_Manager_Interface_Hidden.xml create mode 100644 xml/Account_Manager_Interface_Hidden1.xml diff --git a/src/Makefile.am b/src/Makefile.am index ae47d7e..695ca0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,8 +48,8 @@ mc_gen_headers = \ _gen/interfaces.h \ _gen/svc-Account_Interface_Conditions.h \ _gen/svc-Account_Interface_External_Password_Storage.h \ - _gen/svc-Account_Interface_Hidden.h \ - _gen/svc-Account_Manager_Interface_Hidden.h \ + _gen/svc-Account_Interface_Hidden1.h \ + _gen/svc-Account_Manager_Interface_Hidden1.h \ _gen/svc-dispatcher.h nodist_libmcd_convenience_la_SOURCES = \ @@ -62,8 +62,8 @@ nodist_libmcd_convenience_la_SOURCES = \ _gen/signals-marshal.list \ _gen/svc-Account_Interface_Conditions.c \ _gen/svc-Account_Interface_External_Password_Storage.c \ - _gen/svc-Account_Interface_Hidden.c \ - _gen/svc-Account_Manager_Interface_Hidden.c \ + _gen/svc-Account_Interface_Hidden1.c \ + _gen/svc-Account_Manager_Interface_Hidden1.c \ _gen/svc-dispatcher.c \ mcd-enum-types.c \ mcd-enum-types.h \ @@ -78,10 +78,10 @@ CLEANFILES = \ $(BUILT_SOURCES) \ _gen/cli-Connection_Manager_Interface_Account_Storage-gtk-doc.h \ _gen/svc-dispatcher-gtk-doc.h \ - _gen/svc-Account_Interface_Hidden-gtk-doc.h \ + _gen/svc-Account_Interface_Hidden1-gtk-doc.h \ _gen/svc-Account_Interface_External_Password_Storage-gtk-doc.h \ _gen/svc-Account_Interface_Conditions-gtk-doc.h \ - _gen/svc-Account_Manager_Interface_Hidden-gtk-doc.h \ + _gen/svc-Account_Manager_Interface_Hidden1-gtk-doc.h \ _gen/gtypes-gtk-doc.h \ $(NULL) diff --git a/src/mcd-account-manager-priv.h b/src/mcd-account-manager-priv.h index 80a1e0f..589ec43 100644 --- a/src/mcd-account-manager-priv.h +++ b/src/mcd-account-manager-priv.h @@ -29,7 +29,7 @@ #include "mcd-dbusprop.h" /* auto-generated stubs */ -#include "_gen/svc-Account_Manager_Interface_Hidden.h" +#include "_gen/svc-Account_Manager_Interface_Hidden1.h" G_BEGIN_DECLS diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c index 7c34e67..8fc8704 100644 --- a/src/mcd-account-manager.c +++ b/src/mcd-account-manager.c @@ -76,7 +76,7 @@ static const McdInterfaceData account_manager_interfaces[] = { TP_IFACE_ACCOUNT_MANAGER), MCD_IMPLEMENT_IFACE (mc_svc_account_manager_interface_hidden_get_type, account_manager_hidden, - MC_IFACE_ACCOUNT_MANAGER_INTERFACE_HIDDEN), + MC_IFACE_ACCOUNT_MANAGER_INTERFACE_HIDDEN1), { G_TYPE_INVALID, } }; @@ -1015,7 +1015,7 @@ get_supported_account_properties (TpSvcDBusProperties *svc, TP_IFACE_ACCOUNT_INTERFACE_AVATAR ".Avatar", MC_IFACE_ACCOUNT_INTERFACE_CONDITIONS ".Condition", TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER, - MC_IFACE_ACCOUNT_INTERFACE_HIDDEN ".Hidden", + MC_IFACE_ACCOUNT_INTERFACE_HIDDEN1 ".Hidden", NULL }; diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h index 7225d3e..ba02e00 100644 --- a/src/mcd-account-priv.h +++ b/src/mcd-account-priv.h @@ -38,7 +38,7 @@ /* auto-generated stubs */ #include "_gen/svc-Account_Interface_Conditions.h" #include "_gen/svc-Account_Interface_External_Password_Storage.h" -#include "_gen/svc-Account_Interface_Hidden.h" +#include "_gen/svc-Account_Interface_Hidden1.h" #include "_gen/cli-Connection_Manager_Interface_Account_Storage.h" diff --git a/src/mcd-account.c b/src/mcd-account.c index cdc20e8..0d7f739 100644 --- a/src/mcd-account.c +++ b/src/mcd-account.c @@ -92,7 +92,7 @@ static const McdInterfaceData account_interfaces[] = { TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING), MCD_IMPLEMENT_IFACE (mc_svc_account_interface_hidden_get_type, account_hidden, - MC_IFACE_ACCOUNT_INTERFACE_HIDDEN), + MC_IFACE_ACCOUNT_INTERFACE_HIDDEN1), MCD_IMPLEMENT_OPTIONAL_IFACE ( mc_svc_account_interface_external_password_storage_get_type, account_external_password_storage, diff --git a/src/mcd.xml b/src/mcd.xml index 27ae8d6..89c20b0 100644 --- a/src/mcd.xml +++ b/src/mcd.xml @@ -8,9 +8,9 @@ - + - + diff --git a/xml/Account_Interface_Hidden.xml b/xml/Account_Interface_Hidden.xml deleted file mode 100644 index cb00191..0000000 --- a/xml/Account_Interface_Hidden.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - Copyright © 2010 Collabora Ltd. - -

This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version.

- -

This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details.

- -

You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA.

- - - - (draft 1) - - -

An interface for flagging certain accounts as hidden, so that they do - not appear in the account manager's standard lists of accounts. - Accounts whose Hidden property is - True are intended for non-interactive use (by - non-user-visible services), and appear on the AccountManager.Interface.Hidden.DRAFT1 - interface; in all other respects, they behave like any other - account.

- - -

XMPP, in particular, is increasingly used for purposes other than - instant messaging and VoIP. For instance, extensions exist for - inter-device bookmark synchronization.

- -

While obviously these services could re-use connections intended for - instant messaging, in some cases you might want to use a different - account. (Perhaps your bookmark sync provider is not your IM - provider.) This API allows such auxiliary accounts to exist in - Telepathy, while not being displayed in standard user interfaces for - IM, VoIP, and friends.

- - - - - -

If True, this account is intended for non-interactive - use, and thus should not be presented to the user. It will not appear - in properties and signals on the main AccountManager interface; instead, it - will show up on AccountManager.Interface.Hidden.DRAFT1.

- - - - - - diff --git a/xml/Account_Interface_Hidden1.xml b/xml/Account_Interface_Hidden1.xml new file mode 100644 index 0000000..a786360 --- /dev/null +++ b/xml/Account_Interface_Hidden1.xml @@ -0,0 +1,65 @@ + + + + Copyright © 2010 Collabora Ltd. + +

This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version.

+ +

This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details.

+ +

You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA.

+ + + + (draft 1) + + +

An interface for flagging certain accounts as hidden, so that they do + not appear in the account manager's standard lists of accounts. + Accounts whose Hidden property is + True are intended for non-interactive use (by + non-user-visible services), and appear on the AccountManager.Interface.Hidden1 + interface; in all other respects, they behave like any other + account.

+ + +

XMPP, in particular, is increasingly used for purposes other than + instant messaging and VoIP. For instance, extensions exist for + inter-device bookmark synchronization.

+ +

While obviously these services could re-use connections intended for + instant messaging, in some cases you might want to use a different + account. (Perhaps your bookmark sync provider is not your IM + provider.) This API allows such auxiliary accounts to exist in + Telepathy, while not being displayed in standard user interfaces for + IM, VoIP, and friends.

+ + + + + +

If True, this account is intended for non-interactive + use, and thus should not be presented to the user. It will not appear + in properties and signals on the main AccountManager interface; instead, it + will show up on AccountManager.Interface.Hidden1.

+ + + + + + diff --git a/xml/Account_Manager_Interface_Hidden.xml b/xml/Account_Manager_Interface_Hidden.xml deleted file mode 100644 index 0b52617..0000000 --- a/xml/Account_Manager_Interface_Hidden.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - Copyright © 2010 Collabora Ltd. - Copyright © 2010 Nokia Corporation - -

This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version.

- -

This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details.

- -

You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -

- - - - -

This interface lists accounts whose Hidden - property is True.

- - first draft - - - - A list of usable (complete) Accounts intended - exclusively for noninteractive applications. These accounts are not - included in AccountManager.UsableAccounts. Change - notification is via - HiddenAccountUsabilityChanged. - - - - - - A list of incomplete or otherwise unusable Accounts intended - exclusively for noninteractive applications. Change notification is via - HiddenAccountUsabilityChanged. - - - - - - The given account has been removed from - UsableHiddenAccounts or - UnusableHiddenAccounts. - - - - - An Account, which must not be used any more. - - - - - - - The usability of the given account has changed. New magic - accounts are also indicated by this signal, as an account usability - change (usually to True) on an account that did not previously exist. - - - This is effectively change notification for the usable and unusable - accounts lists. - - - - - - An Account. - - - - - - True if the account is now usable. - - - - - - - diff --git a/xml/Account_Manager_Interface_Hidden1.xml b/xml/Account_Manager_Interface_Hidden1.xml new file mode 100644 index 0000000..2a4d32e --- /dev/null +++ b/xml/Account_Manager_Interface_Hidden1.xml @@ -0,0 +1,100 @@ + + + Copyright © 2010 Collabora Ltd. + Copyright © 2010 Nokia Corporation + +

This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version.

+ +

This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details.

+ +

You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +

+ + + + +

This interface lists accounts whose Hidden + property is True.

+ + first draft + + + + A list of valid (complete, usable) Accounts intended + exclusively for noninteractive applications. These accounts are not + included in AccountManager.UsableAccounts. Change + notification is via + HiddenAccountUsabilityChanged. + + + + + + A list of incomplete or otherwise unusable Accounts intended + exclusively for noninteractive applications. Change notification is via + HiddenAccountUsabilityChanged. + + + + + + The given account has been removed from + UsableHiddenAccounts or + UnusableHiddenAccounts. + + + + + An Account, which must not be used any more. + + + + + + + The validity of the given account has changed. New magic + accounts are also indicated by this signal, as an account validity + change (usually to True) on an account that did not previously exist. + + + This is effectively change notification for the valid and invalid + accounts lists. + + + + + + An Account. + + + + + + True if the account is now valid. + + + + + + + diff --git a/xml/Makefile.am b/xml/Makefile.am index 50ef1d5..ca7efb3 100644 --- a/xml/Makefile.am +++ b/xml/Makefile.am @@ -5,10 +5,10 @@ DROP_NAMESPACE = sed -e 's@xmlns:tp="http://telepathy\.freedesktop\.org/wiki/Dbu DROP_TPTYPE = sed -e 's@tp:type="[^"]*"@@g' SPECS = \ - Account_Manager_Interface_Hidden.xml \ + Account_Manager_Interface_Hidden1.xml \ Account_Interface_Conditions.xml \ Account_Interface_External_Password_Storage.xml \ - Account_Interface_Hidden.xml \ + Account_Interface_Hidden1.xml \ Connection_Manager_Interface_Account_Storage.xml \ Channel_Dispatcher_Interface_Messages_DRAFT.xml diff --git a/xml/nmc5.xml b/xml/nmc5.xml index 130fd3f..b24dd2f 100644 --- a/xml/nmc5.xml +++ b/xml/nmc5.xml @@ -6,8 +6,8 @@ - - + + -- 1.8.4.rc3