2003-07-30 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-bus.c (init_connections_unlocked): fix default system
	bus address to be abstract if we have abstract sockets

	* NEWS: update

3 files changed, 41 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 93ead8c6..1980a4c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-30  Havoc Pennington  <hp@redhat.com>
+
+	* dbus/dbus-bus.c (init_connections_unlocked): fix default system
+	bus address to be abstract if we have abstract sockets
+
+	* NEWS: update
+
 2003-07-28  Havoc Pennington  <hp@redhat.com>
 
 	* bus/messagebus.in: fix to avoid processname/servicename 
diff --git a/NEWS b/NEWS
index 05aa3a9f..69417c9a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,27 @@
+D-BUS 0.12
+===
+
+- fix "service messagebus status" on Red Hat
+- fix demarshaling of DBUS_TYPE_NAMED
+- fix "eval `dbus-launch --exit-with-session`" to exit properly
+- fix build without --prefix
+- useless fooling with Mono bindings
+- useless fooling with gcj bindings
+- fix srcdir != builddir
+- fix various compiler warnings and other issues
+- add get/set data to DBusMessage
+- fix headers for C++
+- OS X build fixes
+- abstract domain sockets support (Linux only)
+- add dbus-cleanup-sockets utility for people
+  not using linux
+- be consistent about defaulting to --session/--system 
+  with command line tools
+- merge in policies from included config files
+- fix build on non-x86
+- docs updates
+- lots of other bugfixes
+
 D-BUS 0.11
 ===
 
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index 6ab1eccc..8ff1298d 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -32,9 +32,14 @@
  * @ingroup DBus
  * @brief Functions for communicating with the message bus
  *
+ * @todo right now the default address of the system bus is hardcoded,
+ * so if you change it in the global config file suddenly you have to
+ * set DBUS_SYSTEM_BUS_ADDRESS env variable.  Might be nice if the
+ * client lib somehow read the config file, or if the bus on startup
+ * somehow wrote out its address to a well-known spot, but might also
+ * not be worth it.
  */
 
-
 /**
  * @defgroup DBusBusInternals Message bus APIs internals
  * @ingroup DBusInternals
@@ -141,7 +146,11 @@ init_connections_unlocked (void)
              {
                /* Use default system bus address if none set in environment */
                bus_connection_addresses[DBUS_BUS_SYSTEM] =
+#ifdef HAVE_ABSTRACT_SOCKETS
+                 _dbus_strdup ("unix:abstract=" DBUS_SYSTEM_BUS_PATH);
+#else
                  _dbus_strdup ("unix:path=" DBUS_SYSTEM_BUS_PATH);
+#endif
                if (bus_connection_addresses[DBUS_BUS_SYSTEM] == NULL)
                  return FALSE;
              }