diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-04-28 11:18:05 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-05-01 22:06:52 +0200 |
| commit | a16faa3985042dadb34600cb0df2eefc61360340 (patch) | |
| tree | af699acf0c3aff6ac79d664565d19d32b72cc3d9 /src/nm-policy.c | |
| parent | 50bafeaf2e318f63dd24053440712dee3035fa84 (diff) | |
| download | NetworkManager-a16faa3985042dadb34600cb0df2eefc61360340.tar.gz | |
core: add parameter to ignore error in add/remove pending action
Add a parameter to nm_device_add_pending_action() to silently
accept adding duplicate actions.
Same for nm_device_remove_pending_action(), to silently ignore
removing non-pending actions.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'src/nm-policy.c')
| -rw-r--r-- | src/nm-policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c index 380f4ced47..88bc31a161 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -941,7 +941,7 @@ activate_data_free (ActivateData *data) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (data->policy); - nm_device_remove_pending_action (data->device, "autoactivate"); + nm_device_remove_pending_action (data->device, "autoactivate", TRUE); priv->pending_activation_checks = g_slist_remove (priv->pending_activation_checks, data); if (data->autoactivate_id) @@ -1226,7 +1226,7 @@ schedule_activate_check (NMPolicy *policy, NMDevice *device) return; } - nm_device_add_pending_action (device, "autoactivate"); + nm_device_add_pending_action (device, "autoactivate", TRUE); data = g_malloc0 (sizeof (ActivateData)); data->policy = policy; |