Merge branch 'experimental'

1 files changed, 29 insertions, 1 deletions

diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml
index dceea7f2..6c6ec282 100644
--- a/introspection/org.freedesktop.NetworkManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -205,7 +205,7 @@
         @state: <link linkend="NMState">NMState</link>
 
         The overall networking state as determined by the NetworkManager daemon,
-        based on the state of network devices under it's management.
+        based on the state of network devices under its management.
     -->
     <method name="state">
       <arg name="state" type="u" direction="out"/>
@@ -252,6 +252,27 @@
     </method>
 
     <!--
+        CheckpointAdjustRollbackTimeout:
+        @add_timeout: number of seconds from ~now~ in which the
+          timeout will expire. Set to 0 to disable the timeout.
+          Note that the added seconds start counting from now,
+          not "Created" timestamp or the previous expiration
+          time. Note that the "Created" property of the checkpoint
+          will stay unchanged by this call. However, the "RollbackTimeout"
+          will be recalculated to give the approximate new expiration time.
+          The new "RollbackTimeout" property will be approximate up to
+          one second precision, which is the accuracy of the property.
+
+        Reset the timeout for rollback for the checkpoint.
+
+        Since: 1.12
+    -->
+    <method name="CheckpointAdjustRollbackTimeout">
+      <arg name="checkpoint" type="o" direction="in"/>
+      <arg name="add_timeout" type="u" direction="in"/>
+    </method>
+
+    <!--
         Devices:
 
         The list of realized network devices. Realized devices are those which
@@ -270,6 +291,13 @@
     <property name="AllDevices" type="ao" access="read"/>
 
     <!--
+        Checkpoints:
+
+        The list of active checkpoints.
+    -->
+    <property name="Checkpoints" type="ao" access="read"/>
+
+    <!--
         NetworkingEnabled:
 
         Indicates if overall networking is currently enabled or not. See the