New upstream version 1.10.4 upstream/1.10.4

5 files changed, 18 insertions, 12 deletions

diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 8f9c50e9..c5a6f1cf 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -1408,7 +1408,7 @@ nm_client_get_connection_by_id (NMClient *client, const char *id)
 	g_return_val_if_fail (id != NULL, NULL);
 
 	if (!nm_client_get_nm_running (client))
-		NULL;
+		return NULL;
 
 	return nm_remote_settings_get_connection_by_id (NM_CLIENT_GET_PRIVATE (client)->settings, id);
 }
@@ -1433,7 +1433,7 @@ nm_client_get_connection_by_path (NMClient *client, const char *path)
 	g_return_val_if_fail (path != NULL, NULL);
 
 	if (!nm_client_get_nm_running (client))
-		NULL;
+		return NULL;
 
 	return nm_remote_settings_get_connection_by_path (NM_CLIENT_GET_PRIVATE (client)->settings, path);
 }
@@ -1458,7 +1458,7 @@ nm_client_get_connection_by_uuid (NMClient *client, const char *uuid)
 	g_return_val_if_fail (uuid != NULL, NULL);
 
 	if (!nm_client_get_nm_running (client))
-		NULL;
+		return NULL;
 
 	return nm_remote_settings_get_connection_by_uuid (NM_CLIENT_GET_PRIVATE (client)->settings, uuid);
 }
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index f05ba17b..6c6491a0 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -333,7 +333,7 @@
     <property name="name" name_upper="NAME" type="string" default="team" description="The setting's name, which uniquely identifies the setting within the connection.  Each setting type has a name unique to that type, for example &quot;ppp&quot; or &quot;wireless&quot; or &quot;wired&quot;." />
     <property name="notify-peers-count" name_upper="NOTIFY_PEERS_COUNT" type="int32" default="0" description="Corresponds to the teamd notify_peers.count." />
     <property name="notify-peers-interval" name_upper="NOTIFY_PEERS_INTERVAL" type="int32" default="0" description="Corresponds to the teamd notify_peers.interval." />
-    <property name="runner" name_upper="RUNNER" type="string" default="&quot;roundrobin&quot;" description="Corresponds to the teamd runner.name. Permitted values are: &quot;roundrobin&quot;, &quot;broadcast&quot;, &quot;activebackup&quot;, &quot;loadbalance&quot;, &quot;lacp&quot;." />
+    <property name="runner" name_upper="RUNNER" type="string" default="&quot;roundrobin&quot;" description="Corresponds to the teamd runner.name. Permitted values are: &quot;roundrobin&quot;, &quot;broadcast&quot;, &quot;activebackup&quot;, &quot;loadbalance&quot;, &quot;lacp&quot;. When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value)." />
     <property name="runner-active" name_upper="RUNNER_ACTIVE" type="boolean" default="FALSE" description="Corresponds to the teamd runner.active." />
     <property name="runner-agg-select-policy" name_upper="RUNNER_AGG_SELECT_POLICY" type="string" description="Corresponds to the teamd runner.agg_select_policy." />
     <property name="runner-fast-rate" name_upper="RUNNER_FAST_RATE" type="boolean" default="FALSE" description="Corresponds to the teamd runner.fast_rate." />
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 76e4238d..c9dbb4ff 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -1118,7 +1118,7 @@ init_async_got_proxy (GObject *object, GAsyncResult *result, gpointer user_data)
 
 	if (priv->auto_register) {
 		nm_secret_agent_old_register_async (init_data->self, init_data->cancellable,
-		                                init_async_registered, init_data);
+		                                    init_async_registered, init_data);
 	} else
 		init_async_complete (init_data, NULL);
 }
@@ -1139,7 +1139,7 @@ init_async_got_bus (GObject *initable, GAsyncResult *result, gpointer user_data)
 	nmdbus_agent_manager_proxy_new (priv->bus,
 	                                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
 	                                | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-	                                NM_DBUS_INTERFACE_AGENT_MANAGER,
+	                                NM_DBUS_SERVICE,
 	                                NM_DBUS_PATH_AGENT_MANAGER,
 	                                init_data->cancellable,
 	                                init_async_got_proxy, init_data);
diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml
index 8711ad27..57553f8b 100644
--- a/libnm/nm-settings-docs.xml
+++ b/libnm/nm-settings-docs.xml
@@ -340,7 +340,7 @@
     <property name="name" name_upper="NAME" type="string" default="team" description="The setting's name, which uniquely identifies the setting within the connection.  Each setting type has a name unique to that type, for example &quot;ppp&quot; or &quot;wireless&quot; or &quot;wired&quot;." />
     <property name="notify-peers-count" name_upper="NOTIFY_PEERS_COUNT" type="int32" default="0" description="Corresponds to the teamd notify_peers.count." />
     <property name="notify-peers-interval" name_upper="NOTIFY_PEERS_INTERVAL" type="int32" default="0" description="Corresponds to the teamd notify_peers.interval." />
-    <property name="runner" name_upper="RUNNER" type="string" default="&quot;roundrobin&quot;" description="Corresponds to the teamd runner.name. Permitted values are: &quot;roundrobin&quot;, &quot;broadcast&quot;, &quot;activebackup&quot;, &quot;loadbalance&quot;, &quot;lacp&quot;." />
+    <property name="runner" name_upper="RUNNER" type="string" default="&quot;roundrobin&quot;" description="Corresponds to the teamd runner.name. Permitted values are: &quot;roundrobin&quot;, &quot;broadcast&quot;, &quot;activebackup&quot;, &quot;loadbalance&quot;, &quot;lacp&quot;. When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value)." />
     <property name="runner-active" name_upper="RUNNER_ACTIVE" type="boolean" default="FALSE" description="Corresponds to the teamd runner.active." />
     <property name="runner-agg-select-policy" name_upper="RUNNER_AGG_SELECT_POLICY" type="string" description="Corresponds to the teamd runner.agg_select_policy." />
     <property name="runner-fast-rate" name_upper="RUNNER_FAST_RATE" type="boolean" default="FALSE" description="Corresponds to the teamd runner.fast_rate." />
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 31e12954..0a785396 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -996,11 +996,6 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 		goto out;
 
 	priv->dbus_vpn_service_plugin = nmdbus_vpn_plugin_skeleton_new ();
-	if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (priv->dbus_vpn_service_plugin),
-	                                       connection,
-	                                       NM_VPN_DBUS_PLUGIN_PATH,
-	                                       error))
-		goto out;
 
 	_nm_dbus_bind_properties (plugin, priv->dbus_vpn_service_plugin);
 	_nm_dbus_bind_methods (plugin, priv->dbus_vpn_service_plugin,
@@ -1015,6 +1010,12 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 	                       "SetFailure", impl_vpn_service_plugin_set_failure,
 	                       NULL);
 
+	if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (priv->dbus_vpn_service_plugin),
+	                                       connection,
+	                                       NM_VPN_DBUS_PLUGIN_PATH,
+	                                       error))
+		goto out;
+
 	nm_vpn_service_plugin_set_connection (plugin, connection);
 	nm_vpn_service_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_INIT);
 
@@ -1109,6 +1110,11 @@ dispose (GObject *object)
 		g_error_free (err);
 	}
 
+	if (priv->dbus_vpn_service_plugin) {
+		g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (priv->dbus_vpn_service_plugin));
+		g_clear_object (&priv->dbus_vpn_service_plugin);
+	}
+
 	G_OBJECT_CLASS (nm_vpn_service_plugin_parent_class)->dispose (object);
 }