api,dbus: rewrote Time interface to be used with gdbus-codegen

6 files changed, 80 insertions, 56 deletions

diff --git a/docs/reference/api/Makefile.am b/docs/reference/api/Makefile.am
index 1d2d353e..26ca5dea 100644
--- a/docs/reference/api/Makefile.am
+++ b/docs/reference/api/Makefile.am
@@ -71,6 +71,7 @@ expand_content_files = \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
+	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
diff --git a/docs/reference/api/ModemManager-dbus-reference.xml b/docs/reference/api/ModemManager-dbus-reference.xml
index 3979731b..b7aa4f9c 100644
--- a/docs/reference/api/ModemManager-dbus-reference.xml
+++ b/docs/reference/api/ModemManager-dbus-reference.xml
@@ -140,6 +140,7 @@
     <xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
     <xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml"/>
     <xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/>
+    <xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/>
     <xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
     <xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/>
   </chapter>
diff --git a/introspection/all.xml b/introspection/all.xml
index 83a90c25..1df239e3 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml
@@ -12,6 +12,7 @@
   <xi:include href="org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Messaging.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Location.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Time.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Contacts.xml"/>
 
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Time.xml b/introspection/org.freedesktop.ModemManager.Modem.Time.xml
deleted file mode 100644
index cfdb9a38..00000000
--- a/introspection/org.freedesktop.ModemManager.Modem.Time.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Time">
-    <tp:docstring>
-      This interface allows clients to receive network time and timezone
-      updates broadcast by mobile networks.
-    </tp:docstring>
-
-    <property name="NetworkTimezone" type="a{sv}" access="read">
-      <tp:docstring>
-        The timezone data provided by the network.  It may include one of more
-        of the following fields:
-
-        'offset': offset of the timezone from UTC, in minutes (including DST,
-                  if applicable).
-        'dst_offset': amount of 'offset' that is due to DST, in minutes.
-        'leap_seconds': number of leap seconds included in the network time.
-      </tp:docstring>
-    </property>
-
-    <method name="GetNetworkTime">
-      <tp:docstring>
-        Gets the current network time.
-
-        This method will only work if the modem tracks, or can request, the
-        current network time; it will not attempt to use previously-received
-        network time updates on the host to guess the current network time.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol"
-                  value="impl_modem_time_get_network_time" />
-      <arg name="time" type="s" direction="out">
-        <tp:docstring>
-          If the network time is known, a string containing a date and time in
-          ISO 8601 format.
-
-          If the network time is unknown, the empty string.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="NetworkTimeChanged">
-      <tp:docstring>
-        Sent when the network time is updated.
-      </tp:docstring>
-      <arg name="time" type="s">
-        <tp:docstring>
-          If the network time is known, a string containing a date and time in
-          ISO 8601 format.
-
-          If the network time is unknown, the empty string.
-        </tp:docstring>
-      </arg>
-    </signal>
-  </interface>
-</node>
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Time.xml b/introspection/org.freedesktop.ModemManager1.Modem.Time.xml
new file mode 100644
index 00000000..5278c774
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Time.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ ModemManager 0.6 Interface Specification
+
+   Copyright (C) 2011 The Chromium OS Authors
+   Copyright (C) 2011 - 2012 Google, Inc.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      org.freedesktop.ModemManager1.Modem.Time:
+      @short_description: The ModemManager Time interface.
+
+      This interface allows clients to receive network time and timezone
+      updates broadcast by mobile networks.
+  -->
+  <interface name="org.freedesktop.ModemManager1.Modem.Time">
+
+    <!--
+        GetNetworkTime:
+        @time: If the network time is known, a string containing date and time in ISO 8601 format. If the network time is unknown, the empty string.
+
+        Gets the current network time.
+
+        This method will only work if the modem tracks, or can request, the
+        current network time; it will not attempt to use previously-received
+        network time updates on the host to guess the current network time.
+    -->
+    <method name="GetNetworkTime">
+      <arg name="time" type="s" direction="out" />
+    </method>
+
+    <!--
+        NetworkTimezone:
+
+        The timezone data provided by the network. It may include one or more
+        of the following fields:
+
+        <variablelist>
+          <varlistentry><term><literal>"offset"</literal></term>
+            <listitem>
+              Offset of the timezone from UTC, in minutes (including DST, if applicable),
+              given as a signed integer value (signature <literal>"i"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"dst-offset"</literal></term>
+            <listitem>
+              Amount of offset that is due to DST (daylight saving time),
+              given as a signed integer value (signature <literal>"i"</literal>).
+            </listitem>
+          </varlistentry>
+          <varlistentry><term><literal>"leap-seconds"</literal></term>
+            <listitem>
+              Number of leap seconds included in the network time,
+              given as a signed integer value (signature <literal>"i"</literal>).
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <property name="NetworkTimezone" type="a{sv}" access="read" />
+
+    <!--
+        NetworkTimeChanged:
+        @time: A string containing date and time in ISO 8601 format.
+
+        Sent when the network time is updated.
+    -->
+    <signal name="NetworkTimeChanged">
+      <arg name="time" type="s" />
+    </signal>
+
+  </interface>
+</node>
diff --git a/libmm-common/Makefile.am b/libmm-common/Makefile.am
index dcea8779..5a97112f 100644
--- a/libmm-common/Makefile.am
+++ b/libmm-common/Makefile.am
@@ -28,6 +28,7 @@ GENERATED_DOC = \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
@@ -100,6 +101,7 @@ mm_gdbus_modem_deps = \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Location.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Time.xml \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Firmware.xml \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml \
 	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml \