[Pkg-telepathy-commits] [telepathy-mission-control-6] 65/280: Upgrade to the Hidden1 interface from telepathy-spec 0.99.2
Simon McVittie
smcv at debian.org
Thu Mar 27 20:07:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.
commit 5c85d4a98aadb789a558eee3bfb29d274af3c246
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Fri Sep 27 18:03:15 2013 +0100
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.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54879
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
---
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 ++--
...ce_Hidden.xml => Account_Interface_Hidden1.xml} | 10 ++++-----
...n.xml => Account_Manager_Interface_Hidden1.xml} | 24 +++++++++++-----------
xml/Makefile.am | 4 ++--
xml/nmc5.xml | 4 ++--
10 files changed, 34 insertions(+), 34 deletions(-)
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 @@
<xi:include href="../xml/Account_Interface_Conditions.xml"/>
<xi:include href="../xml/Account_Interface_External_Password_Storage.xml"/>
-<xi:include href="../xml/Account_Interface_Hidden.xml"/>
+<xi:include href="../xml/Account_Interface_Hidden1.xml"/>
-<xi:include href="../xml/Account_Manager_Interface_Hidden.xml"/>
+<xi:include href="../xml/Account_Manager_Interface_Hidden1.xml"/>
<xi:include href="dispatcher.xml"/>
diff --git a/xml/Account_Interface_Hidden.xml b/xml/Account_Interface_Hidden1.xml
similarity index 89%
rename from xml/Account_Interface_Hidden.xml
rename to xml/Account_Interface_Hidden1.xml
index cb00191..a786360 100644
--- a/xml/Account_Interface_Hidden.xml
+++ b/xml/Account_Interface_Hidden1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<node name="/Account_Interface_Hidden"
+<node name="/Account_Interface_Hidden1"
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
@@ -20,7 +20,7 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Account.Interface.Hidden.DRAFT1"
+ <interface name="im.telepathy1.Account.Interface.Hidden1"
tp:causes-havoc="outrageous">
<tp:added version="0.21.10">(draft 1)</tp:added>
@@ -30,7 +30,7 @@
Accounts whose <tp:member-ref>Hidden</tp:member-ref> property is
<code>True</code> are intended for non-interactive use (by
non-user-visible services), and appear on the <tp:dbus-ref
- namespace='ofdT'>AccountManager.Interface.Hidden.DRAFT1</tp:dbus-ref>
+ namespace='imt1'>AccountManager.Interface.Hidden1</tp:dbus-ref>
interface; in all other respects, they behave like any other
account.</p>
@@ -54,9 +54,9 @@
<p>If <code>True</code>, 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 <tp:dbus-ref
- namespace='ofdT'>AccountManager</tp:dbus-ref> interface; instead, it
+ namespace='imt1'>AccountManager</tp:dbus-ref> interface; instead, it
will show up on <tp:dbus-ref
- namespace='ofdT'>AccountManager.Interface.Hidden.DRAFT1</tp:dbus-ref>.</p>
+ namespace='imt1'>AccountManager.Interface.Hidden1</tp:dbus-ref>.</p>
</tp:docstring>
</property>
diff --git a/xml/Account_Manager_Interface_Hidden.xml b/xml/Account_Manager_Interface_Hidden1.xml
similarity index 81%
rename from xml/Account_Manager_Interface_Hidden.xml
rename to xml/Account_Manager_Interface_Hidden1.xml
index 0b52617..2a4d32e 100644
--- a/xml/Account_Manager_Interface_Hidden.xml
+++ b/xml/Account_Manager_Interface_Hidden1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<node name="/Account_Manager_Interface_Hidden"
+<node name="/Account_Manager_Interface_Hidden1"
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
<tp:copyright>Copyright © 2010 Nokia Corporation</tp:copyright>
@@ -20,12 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</p>
</tp:license>
<interface
- name="org.freedesktop.Telepathy.AccountManager.Interface.Hidden.DRAFT1"
+ name="im.telepathy1.AccountManager.Interface.Hidden1"
tp:causes-havoc='kind of sketchy'>
- <tp:requires interface='org.freedesktop.Telepathy.AccountManager'/>
+ <tp:requires interface='im.telepathy1.AccountManager'/>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>This interface lists accounts whose <tp:dbus-ref
- namespace='ofdT.Account.Interface.Hidden.DRAFT1'>Hidden</tp:dbus-ref>
+ namespace='imt1.Account.Interface.Hidden1'>Hidden</tp:dbus-ref>
property is <code>True</code>.</p>
</tp:docstring>
<tp:added version="0.21.10">first draft</tp:added>
@@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="UsableHiddenAccounts" type="ao" access="read"
tp:name-for-bindings="Usable_Hidden_Accounts">
<tp:docstring>
- A list of usable (complete) <tp:dbus-ref
- namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>s intended
+ 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.UsableAccounts</tp:dbus-ref>. Change
@@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
tp:name-for-bindings="Unusable_Hidden_Accounts">
<tp:docstring>
A list of incomplete or otherwise unusable <tp:dbus-ref
- namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>s intended
+ namespace="im.telepathy1">Account</tp:dbus-ref>s intended
exclusively for noninteractive applications. Change notification is via
<tp:member-ref>HiddenAccountUsabilityChanged</tp:member-ref>.
</tp:docstring>
@@ -71,12 +71,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<signal name="HiddenAccountUsabilityChanged"
tp:name-for-bindings="Hidden_Account_Usability_Changed">
<tp:docstring>
- The usability of the given account has changed. New magic
- accounts are also indicated by this signal, as an account usability
+ 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.
<tp:rationale>
- This is effectively change notification for the usable and unusable
+ This is effectively change notification for the valid and invalid
accounts lists.
</tp:rationale>
</tp:docstring>
@@ -84,13 +84,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<arg name="Account" type="o">
<tp:docstring>
An <tp:dbus-ref
- namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>.
+ namespace="im.telepathy1">Account</tp:dbus-ref>.
</tp:docstring>
</arg>
<arg name="Usable" type="b">
<tp:docstring>
- True if the account is now usable.
+ True if the account is now valid.
</tp:docstring>
</arg>
</signal>
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 at xmlns:tp="http://telepathy\.freedesktop\.org/wiki/Dbu
DROP_TPTYPE = sed -e 's at 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 @@
<xi:include href="Account_Interface_Conditions.xml"/>
<xi:include href="Account_Interface_External_Password_Storage.xml"/>
-<xi:include href="Account_Interface_Hidden.xml"/>
-<xi:include href="Account_Manager_Interface_Hidden.xml"/>
+<xi:include href="Account_Interface_Hidden1.xml"/>
+<xi:include href="Account_Manager_Interface_Hidden1.xml"/>
<xi:include href="Connection_Manager_Interface_Account_Storage.xml"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git
More information about the Pkg-telepathy-commits
mailing list