diff options
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/Makefile.am | 2 | ||||
| -rw-r--r-- | dbus/dbus-bus.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 475f0cb7..c7a93b58 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -1,6 +1,6 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION \ - -DDBUS_SYSTEM_BUS_PATH=\""$(localstatedir)/@DBUS_SYSTEM_SOCKET@"\" + -DDBUS_SYSTEM_BUS_PATH=\""@EXPANDED_LOCALSTATEDIR@/@DBUS_SYSTEM_SOCKET@"\" dbusincludedir=$(includedir)/dbus-1.0/dbus 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); |