From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 25 Feb 2011 15:49:55 +0000 (+0000)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.4.8~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07d2ca2b52570db6591b61b5ca24913d8f936e55;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
---

07d2ca2b52570db6591b61b5ca24913d8f936e55
diff --cc NEWS
index d869b51fc,466a6d27a..9bdc66297
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,15 +1,23 @@@
 +D-Bus 1.5.0 (UNRELEASED)
 +==
 +
 +  • Let the bus daemon implement more than one interface (fd.o #33757,
 +    Simon McVittie)
 +  • Optimize _dbus_string_replace_len to reduce waste (fd.o #21261,
 +    Roberto Guido)
++
+ D-Bus 1.4.8 (UNRELEASED)
+ ==
+ 
    • Include _dbus_path_is_absolute in libdbus on Windows, fixing compilation
      (fd.o #32805, Mark Brand)
+   • Rename configure.in to configure.ac, and update it to modern conventions
+     (fd.o #32245; Javier Jardón, Simon McVittie)
+   • Correctly give XDG_DATA_HOME priority over XDG_DATA_DIRS (fd.o #34496,
+     Anders Kaseorg)
+   • Prevent X11 autolaunching if $DISPLAY is unset or empty, and add
+     --disable-x11-autolaunch configure option to prevent it altogether
+     in embedded environments (fd.o #19997, NB#219964; Simon McVittie)
  
  D-Bus 1.4.6 (2010-02-17)
  ==