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

diff --git a/ChangeLog b/ChangeLog
index d4b18296899cd0dbdb7b75a8c2d35ae5a9c35c7c..d977b6b1551f1d1924757c5209a9c64916c0bc91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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
+
 2003-03-31  Havoc Pennington  <hp@pobox.com>
 
        * 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 a3740a487ae186f1f46581094144c6d4ce15c3ab..9988fb6935ed3f38e31dad8cbbb61de007cca4e7 100644 (file)
--- 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 475f0cb735701fda2d469be9dfd21cab01c135ee..c7a93b58f90f01b2dd48e048bb4fc5061c27c458 100644 (file)
--- 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 22af3dabfe23f7e32fa0afff3e72a301293fc571..d65a3f0f21b7e49b172e2a578ea36b1a5b39fc93 100644 (file)
--- 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 001e0a5ef92769d45474ae32588665bd7bb9d38f..ae07add85d94b222fefc554d7c875e326bcfb74e 100644 (file)
--- 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