diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
| commit | f1c906035c6ea7eb635664835c153aed553dc2e5 (patch) | |
| tree | 7b870b6cef1f902486dc706084124c6964b342a6 /src/nm-firewall-manager.c | |
| parent | d6158994abe7b2be73443f933ed7fdcc40954c24 (diff) | |
| parent | d0408a3e3b1cc6effec321d098008ef0c4acf91b (diff) | |
Merge tag 'debian/1.10.4-1' into bionic
network-manager Debian release 1.10.4-1
Diffstat (limited to 'src/nm-firewall-manager.c')
| -rw-r--r-- | src/nm-firewall-manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index b9878592..216d5fc8 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -186,7 +186,7 @@ _cb_info_create (NMFirewallManager *self, static void _cb_info_free (CBInfo *info) { - c_list_unlink (&info->lst); + c_list_unlink_stale (&info->lst); if (info->mode != CB_INFO_MODE_IDLE) { if (info->dbus.arg) g_variant_unref (info->dbus.arg); @@ -213,7 +213,7 @@ _cb_info_complete_normal (CBInfo *info, GError *error) nm_assert (c_list_contains (&priv->pending_calls, &info->lst)); - c_list_unlink_init (&info->lst); + c_list_unlink (&info->lst); _cb_info_callback (info, error); _cb_info_free (info); @@ -428,7 +428,7 @@ nm_firewall_manager_cancel_call (NMFirewallManagerCallId call) nm_assert (c_list_contains (&priv->pending_calls, &info->lst)); - c_list_unlink_init (&info->lst); + c_list_unlink (&info->lst); nm_utils_error_set_cancelled (&error, FALSE, "NMFirewallManager"); @@ -527,7 +527,7 @@ again: _handle_dbus_start (self, info); } else { _LOGD (info, "complete: fake success"); - c_list_unlink_init (&info->lst); + c_list_unlink (&info->lst); _cb_info_callback (info, NULL); _cb_info_free (info); goto again; |