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 /libnm/nm-object.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 'libnm/nm-object.c')
| -rw-r--r-- | libnm/nm-object.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm/nm-object.c b/libnm/nm-object.c index c344a08d..c5316880 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -161,7 +161,7 @@ typedef struct { static void notify_item_free (NotifyItem *item) { - c_list_unlink (&item->lst); + c_list_unlink_stale (&item->lst); g_clear_object (&item->changed); g_slice_free (NotifyItem, item); } @@ -187,7 +187,7 @@ deferred_notify_cb (gpointer data) * list we're iterating. */ c_list_link_after (&priv->notify_items, &props); - c_list_unlink_init (&priv->notify_items); + c_list_unlink (&priv->notify_items); g_object_ref (object); @@ -344,7 +344,7 @@ odata_free (gpointer data) { ObjectCreatedData *odata = data; - c_list_unlink (&odata->lst_pending); + c_list_unlink_stale (&odata->lst_pending); g_object_unref (odata->self); g_free (odata->objects); g_slice_free (ObjectCreatedData, odata); |