From a222e56e103f949b148a6942e385ccca2c26d9f3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 16 Feb 2017 00:00:34 +0100 Subject: New upstream version 1.6.2 --- src/nm-policy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nm-policy.c') diff --git a/src/nm-policy.c b/src/nm-policy.c index 266bc5b1..a2ff2945 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -943,7 +943,7 @@ activate_data_free (ActivateData *data) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (data->policy); - nm_device_remove_pending_action (data->device, "autoactivate", TRUE); + nm_device_remove_pending_action (data->device, NM_PENDING_ACTION_AUTOACTIVATE, TRUE); priv->pending_activation_checks = g_slist_remove (priv->pending_activation_checks, data); if (data->autoactivate_id) @@ -1253,7 +1253,7 @@ schedule_activate_check (NMPolicy *self, NMDevice *device) return; } - nm_device_add_pending_action (device, "autoactivate", TRUE); + nm_device_add_pending_action (device, NM_PENDING_ACTION_AUTOACTIVATE, TRUE); data = g_slice_new0 (ActivateData); data->policy = self; @@ -2024,7 +2024,7 @@ _deactivate_if_active (NMManager *manager, NMSettingsConnection *connection) if (nm_active_connection_get_settings_connection (ac) == connection && (state <= NM_ACTIVE_CONNECTION_STATE_ACTIVATED)) { if (!nm_manager_deactivate_connection (manager, - nm_exported_object_get_path (NM_EXPORTED_OBJECT (ac)), + ac, NM_DEVICE_STATE_REASON_CONNECTION_REMOVED, &error)) { _LOGW (LOGD_DEVICE, "connection '%s' disappeared, but error deactivating it: (%d) %s", -- cgit 1.3.0-6-gf8a5