Merge tag 'upstream/0.9.10.0'

Upstream version 0.9.10.0

1 files changed, 37 insertions, 9 deletions

diff --git a/introspection/vpn-errors.xml b/introspection/vpn-errors.xml
index 0dba7e6f..7b92d073 100644
--- a/introspection/vpn-errors.xml
+++ b/introspection/vpn-errors.xml
@@ -2,31 +2,59 @@
 <tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
     namespace="org.freedesktop.NetworkManager.VPN.Error">
   <tp:error name="General">
-    <tp:docstring>This is a drab, nondescript error.</tp:docstring>
+    <tp:docstring>General failure without further details.</tp:docstring>
   </tp:error>
   <tp:error name="StartingInProgress">
-    <tp:docstring>The request could not be processed because the VPN connection is already being started.</tp:docstring>
+    <tp:docstring>
+      The plugin is already starting, and another connect request was received.
+    </tp:docstring>
   </tp:error>
   <tp:error name="AlreadyStarted">
-    <tp:docstring>The request could not be processed because a VPN connection was already active.</tp:docstring>
+    <tp:docstring>
+      The plugin is already connected, and another connect request was received.
+    </tp:docstring>
   </tp:error>
   <tp:error name="StoppingInProgress">
-    <tp:docstring>The request could not be processed because the VPN connection is already being stopped.</tp:docstring>
+    <tp:docstring>
+      The plugin is already stopping, and another stop request was received.
+    </tp:docstring>
   </tp:error>
   <tp:error name="AlreadyStopped">
-    <tp:docstring>The request could not be processed because the VPN connection was already stopped.</tp:docstring>
+    <tp:docstring>
+      The plugin is already stopped, and another disconnect request was received.
+    </tp:docstring>
   </tp:error>
   <tp:error name="WrongState">
-    <tp:docstring>The request could not be processed because the VPN connection is in the wrong state for this type of request. FIXME: too general?</tp:docstring>
+    <tp:docstring>
+      The request could not be processed because the VPN plugin is in the wrong
+      state for this type of request.
+    </tp:docstring>
   </tp:error>
   <tp:error name="BadArguments">
-    <tp:docstring>Invalid arguments were passed with the request.  FIXME: too general.</tp:docstring>
+    <tp:docstring>
+      The request could not be processed because it contained malformed
+      arguments, or arguments of unexpected type. It usually means that one of
+      the VPN setting data items or secrets was not of the expected type (i.e.
+      int, string, bool, etc).
+    </tp:docstring>
   </tp:error>
   <tp:error name="LaunchFailed">
-    <tp:docstring>A binary providing the service failed to launch.</tp:docstring>
+    <tp:docstring>
+      A binary providing the service failed to launch.
+    </tp:docstring>
   </tp:error>
   <tp:error name="ConnectionInvalid">
-    <tp:docstring>The request could not be processed because the VPN connection settings were invalid.</tp:docstring>
+    <tp:docstring>
+      The request could not be processed because the connection was invalid. It
+      usually means that the connection's VPN setting was missing some required
+      data item or secret.
+    </tp:docstring>
+  </tp:error>
+  <tp:error name="InteractiveNotSupported">
+    <tp:docstring>
+      The request could not be processed because the plugin does not support
+      interactive operations, such as ConnectInteractive() or NewSecrets().
+    </tp:docstring>
   </tp:error>
 </tp:errors>