fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-04 22:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cherry-pick-b034b83b' into 'dbus-1.12'

Browse source 
[1.12] bus: Don't explicitly clear BusConnections.monitors

See merge request dbus/dbus!142
This commit is contained in:
Simon McVittie 2020-02-25 12:59:48 +00:00
commit d251fe7850
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bus/connection.c
View file

@ -537,9 +537,6 @@ bus_connections_unref (BusConnections *connections)
_dbus_assert (connections->n_incomplete == 0);
/* drop all monitors */
_dbus_list_clear (&connections->monitors);
/* drop all real connections */
while (connections->completed != NULL)
{
@ -555,6 +552,10 @@ bus_connections_unref (BusConnections *connections)
_dbus_assert (connections->n_completed == 0);
/* disconnecting all the connections should have emptied the list of
* monitors (each link is removed in bus_connection_disconnected) */
_dbus_assert (connections->monitors == NULL);
bus_expire_list_free (connections->pending_replies);
_dbus_loop_remove_timeout (bus_context_get_loop (connections->context),