From e6809d1a692da3b1127610b527f636743458274b Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 31 Mar 2003 08:28:23 +0000 Subject: 2003-03-31 Havoc Pennington * 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 --- ChangeLog | 13 +++++++++++++ bus/config-loader-expat.c | 2 +- dbus/Makefile.am | 2 +- dbus/dbus-bus.c | 6 +++++- doc/TODO | 4 ---- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4b18296..d977b6b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2003-03-31 Havoc Pennington + + * 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 + 2003-03-31 Havoc Pennington * dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket) diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c index a3740a48..9988fb69 100644 --- a/bus/config-loader-expat.c +++ b/bus/config-loader-expat.c @@ -166,7 +166,7 @@ BusConfigParser* bus_config_load (const DBusString *file, DBusError *error) { - XML_Parser *expat; + XML_Parser expat; const char *filename; BusConfigParser *parser; ExpatParseContext context; 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); diff --git a/doc/TODO b/doc/TODO index 001e0a5e..ae07add8 100644 --- a/doc/TODO +++ b/doc/TODO @@ -23,10 +23,6 @@ - Recursive/composite/etc. types and associated API, see mailing list. - - dbus-bus.h should contain convenience API for connecting to system - and login-session message buses (automatically handling env - variables etc.) - - Configuration file (working on that now) - Property list feature on message bus (list of properties associated -- cgit