summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-bus.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-03-31 08:28:23 +0000
committerHavoc Pennington <hp@redhat.com>2003-03-31 08:28:23 +0000
commite6809d1a692da3b1127610b527f636743458274b (patch)
treed9c97aeaaee3a803fd7561c79acd01d6d5aec72a /dbus/dbus-bus.c
parent29c71168cd17b11eed65023c97aff401d5305b01 (diff)
2003-03-31 Havoc Pennington <hp@redhat.com>
* dbus/Makefile.am (INCLUDES): use EXPANDED_LOCALSTATEDIR to define DBUS_SYSTEM_BUS_PATH as we want to compile in the same final location that lands in the config file * bus/config-loader-expat.c (bus_config_load): fix type of XML_Parser variable * doc/TODO: remove TODO item for dbus_bus_get() * dbus/dbus-bus.c (bus_data_free): add missing lock/unlock
Diffstat (limited to 'dbus/dbus-bus.c')
-rw-r--r--dbus/dbus-bus.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index 22af3dab..d65a3f0f 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -117,7 +117,11 @@ bus_data_free (void *data)
BusData *bd = data;
if (bd->connection)
- *bd->connection = NULL;
+ {
+ _DBUS_LOCK (bus);
+ *bd->connection = NULL;
+ _DBUS_UNLOCK (bus);
+ }
dbus_free (bd->base_service);
dbus_free (bd);