Imported Upstream version 1.1.92 upstream/1.1.92

3 files changed, 31 insertions, 31 deletions

diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
index f7f9e965..015bb070 100644
--- a/callouts/nm-dispatcher-utils.c
+++ b/callouts/nm-dispatcher-utils.c
@@ -313,6 +313,7 @@ construct_device_dhcp6_items (GSList *items, GVariant *dhcp6_config)
 		tmp = g_variant_get_string (val, NULL);
 		items = g_slist_prepend (items, g_strdup_printf ("DHCP6_%s=%s", ucased, tmp));
 		g_free (ucased);
+		g_variant_unref (val);
 	}
 	return items;
 }
diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c
index de13bd0d..7ddffb04 100644
--- a/callouts/nm-dispatcher.c
+++ b/callouts/nm-dispatcher.c
@@ -549,8 +549,7 @@ script_dispatch (ScriptInfo *script)
 			request->num_scripts_nowait++;
 		return TRUE;
 	} else {
-		_LOG_S_W (script, "complete: failed to execute script: %s (%d)",
-		          error->message, error->code);
+		_LOG_S_W (script, "complete: failed to execute script: %s", error->message);
 		script->result = DISPATCH_RESULT_EXEC_FAILED;
 		script->error = g_strdup (error->message);
 		request->num_scripts_done++;
@@ -594,8 +593,8 @@ find_scripts (const char *str_action)
 		dirname = NMD_SCRIPT_DIR_DEFAULT;
 
 	if (!(dir = g_dir_open (dirname, 0, &error))) {
-		g_message ("find-scripts: Failed to open dispatcher directory '%s': (%d) %s",
-		           dirname, error->code, error->message);
+		g_message ("find-scripts: Failed to open dispatcher directory '%s': %s",
+		           dirname, error->message);
 		g_error_free (error);
 		return NULL;
 	}
diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml
index b2c4a21a..e2e89a89 100644
--- a/callouts/nm-dispatcher.xml
+++ b/callouts/nm-dispatcher.xml
@@ -5,87 +5,87 @@
     <annotation name="org.gtk.GDBus.C.Name" value="Dispatcher"/>
 
     <method name="Action">
-      <tp:docstring>
+      <annotation name="org.gtk.GDBus.DocString" value="
         INTERNAL; not public API.  Perform an action.
-      </tp:docstring>
+      " />
 
       <arg name="action" type="s" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The action being performed.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="connection" type="a{sa{sv}}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           The connection for which this action was triggered.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="connection_properties" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the connection, including service and path.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_properties" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device, including type, path, interface, and state.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_ip4_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device's IPv4 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_ip6_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device's IPv6 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_dhcp4_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device's DHCPv4 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="device_dhcp6_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the device's DHCPv6 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="vpn_ip_iface" type="s" direction="in">
-        <tp:docstring>VPN interface name.</tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="VPN interface name." />
       </arg>
 
       <arg name="vpn_ip4_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the VPN's IPv4 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="vpn_ip6_config" type="a{sv}" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Properties of the VPN's IPv6 configuration.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="debug" type="b" direction="in">
-        <tp:docstring>
+        <annotation name="org.gtk.GDBus.DocString" value="
           Whether to log debug output.
-        </tp:docstring>
+        " />
       </arg>
 
       <arg name="results" type="a(sus)" direction="out">
-        <tp:docstring>
+        <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).
-        </tp:docstring>
+        " />
       </arg>
 
     </method>