Imported Upstream version 1.1.93 upstream/1.1.93

5 files changed, 33 insertions, 90 deletions

diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index 6440a4de..5279b2f4 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I${top_builddir}/libnm-core \
 	$(GLIB_CFLAGS) \
 	-DNETWORKMANAGER_COMPILATION \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\"
diff --git a/callouts/Makefile.in b/callouts/Makefile.in
index 2fa3d996..e7a7f2aa 100644
--- a/callouts/Makefile.in
+++ b/callouts/Makefile.in
@@ -544,7 +544,6 @@ AM_CPPFLAGS = \
 	-I${top_builddir}/libnm-core \
 	$(GLIB_CFLAGS) \
 	-DNETWORKMANAGER_COMPILATION \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\"
diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml
index e2e89a89..27f15fe5 100644
--- a/callouts/nm-dispatcher.xml
+++ b/callouts/nm-dispatcher.xml
@@ -1,93 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
   <interface name="org.freedesktop.nm_dispatcher">
     <annotation name="org.gtk.GDBus.C.Name" value="Dispatcher"/>
 
+    <!--
+        Action:
+        @action: The action being performed.
+        @connection: The connection for which this action was triggered.
+        @connection_properties: Properties of the connection, including service and path.
+        @device_properties: Properties of the device, including type, path, interface, and state.
+        @device_ip4_config: Properties of the device's IPv4 configuration.
+        @device_ip6_config: Properties of the device's IPv6 configuration.
+        @device_dhcp4_config: Properties of the device's DHCPv4 configuration.
+        @device_dhcp6_config: Properties of the device's DHCPv6 configuration.
+        @vpn_ip_iface: VPN interface name.
+        @vpn_ip4_config: Properties of the VPN's IPv4 configuration.
+        @vpn_ip6_config: Properties of the VPN's IPv6 configuration.
+        @debug: Whether to log debug output.
+        @results: Results of dispatching operations. Each element of the returned array is a struct containing the path of an executed script (s), the result of running that script (u), and a description of the result (s).
+
+        INTERNAL; not public API. Perform an action.
+    -->
     <method name="Action">
-      <annotation name="org.gtk.GDBus.DocString" value="
-        INTERNAL; not public API.  Perform an action.
-      " />
-
-      <arg name="action" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The action being performed.
-        " />
-      </arg>
-
-      <arg name="connection" type="a{sa{sv}}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          The connection for which this action was triggered.
-        " />
-      </arg>
-
-      <arg name="connection_properties" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the connection, including service and path.
-        " />
-      </arg>
-
-      <arg name="device_properties" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device, including type, path, interface, and state.
-        " />
-      </arg>
-
-      <arg name="device_ip4_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device's IPv4 configuration.
-        " />
-      </arg>
-
-      <arg name="device_ip6_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device's IPv6 configuration.
-        " />
-      </arg>
-
-      <arg name="device_dhcp4_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device's DHCPv4 configuration.
-        " />
-      </arg>
-
-      <arg name="device_dhcp6_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the device's DHCPv6 configuration.
-        " />
-      </arg>
-
-      <arg name="vpn_ip_iface" type="s" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="VPN interface name." />
-      </arg>
-
-      <arg name="vpn_ip4_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the VPN's IPv4 configuration.
-        " />
-      </arg>
-
-      <arg name="vpn_ip6_config" type="a{sv}" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Properties of the VPN's IPv6 configuration.
-        " />
-      </arg>
-
-      <arg name="debug" type="b" direction="in">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Whether to log debug output.
-        " />
-      </arg>
-
-      <arg name="results" type="a(sus)" direction="out">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Results of dispatching operations.  Each element of the returned
-          array is a struct containing the path of an executed script (s),
-          the result of running that script (u), and a description of the
-          result (s).
-        " />
-      </arg>
-
+      <arg name="action" type="s" direction="in"/>
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="connection_properties" type="a{sv}" direction="in"/>
+      <arg name="device_properties" type="a{sv}" direction="in"/>
+      <arg name="device_ip4_config" type="a{sv}" direction="in"/>
+      <arg name="device_ip6_config" type="a{sv}" direction="in"/>
+      <arg name="device_dhcp4_config" type="a{sv}" direction="in"/>
+      <arg name="device_dhcp6_config" type="a{sv}" direction="in"/>
+      <arg name="vpn_ip_iface" type="s" direction="in"/>
+      <arg name="vpn_ip4_config" type="a{sv}" direction="in"/>
+      <arg name="vpn_ip6_config" type="a{sv}" direction="in"/>
+      <arg name="debug" type="b" direction="in"/>
+      <arg name="results" type="a(sus)" direction="out"/>
     </method>
   </interface>
 </node>
diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index ee3f647d..6ac15874 100644
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/callouts \
 	-I$(top_builddir)/callouts \
 	-DNETWORKMANAGER_COMPILATION \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DSRCDIR=\"$(abs_srcdir)\" \
 	$(GLIB_CFLAGS)
 
diff --git a/callouts/tests/Makefile.in b/callouts/tests/Makefile.in
index eeaf70d6..6079f236 100644
--- a/callouts/tests/Makefile.in
+++ b/callouts/tests/Makefile.in
@@ -664,7 +664,6 @@ with_valgrind = @with_valgrind@
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/callouts \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/callouts \
 @ENABLE_TESTS_TRUE@	-DNETWORKMANAGER_COMPILATION \
-@ENABLE_TESTS_TRUE@	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 @ENABLE_TESTS_TRUE@	-DSRCDIR=\"$(abs_srcdir)\" \
 @ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)