[telepathy-mission-control/master] ChannelRequests: remove tp:type from User_Action_Time; generic-types: redefine Unix_Timestamp64
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Jun 10 08:03:27 PDT 2009
The D-Bus type of Unix_Timestamp64 was changed to signed in
telepathy-spec; for compatibility, the one in ChannelRequests stays as
unsigned, which means it no longer matches the definition of Unix_Timestamp64.
(When the codegen scripts are updated from telepathy-glib, we'll get
stricter checks that would fail on this inconsistency.)
---
xml/Account_Interface_ChannelRequests.xml | 6 ++----
xml/generic-types.xml | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/xml/Account_Interface_ChannelRequests.xml b/xml/Account_Interface_ChannelRequests.xml
index 039a2ea..6aad9c7 100644
--- a/xml/Account_Interface_ChannelRequests.xml
+++ b/xml/Account_Interface_ChannelRequests.xml
@@ -44,8 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
</tp:docstring>
</arg>
- <arg direction="in" name="User_Action_Time" type="t"
- tp:type="Unix_Timestamp64">
+ <arg direction="in" name="User_Action_Time" type="t">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>The time at which user action occurred, or 0 if this channel
request is for some reason not involving user action.
@@ -127,8 +126,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
</tp:docstring>
</arg>
- <arg direction="in" name="User_Action_Time" type="t"
- tp:type="Unix_Timestamp64">
+ <arg direction="in" name="User_Action_Time" type="t">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>The time at which user action occurred, or 0 if this channel
request is for some reason not involving user action.
diff --git a/xml/generic-types.xml b/xml/generic-types.xml
index 0283962..55ae77a 100644
--- a/xml/generic-types.xml
+++ b/xml/generic-types.xml
@@ -7,8 +7,8 @@
(1970-01-01T00:00:00Z)</tp:docstring>
</tp:simple-type>
- <tp:simple-type name="Unix_Timestamp64" type="t">
- <tp:docstring>An unsigned 64-bit integer representing time as the number
+ <tp:simple-type name="Unix_Timestamp64" type="x">
+ <tp:docstring>A signed 64-bit integer representing time as the number
of seconds elapsed since the Unix epoch
(1970-01-01T00:00:00Z)</tp:docstring>
--
1.5.6.5
More information about the telepathy-commits
mailing list