Merge branch 'dbus-1.4'

diff --cc NEWS
index e5fc582,ac7096e..30435c5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -23,36 -21,18 +23,37 @@@ D-Bus 1.5.8 (UNRELEASED
  • Windows-specific:
    · Fix compilation on MSVC, which doesn't understand "inline" with its
      C99 meaning (Ralf Habacker)
+   · Fix misuse of GPid in test/dbus-daemon.c (fd.o #40003, Simon McVittie)
  
 -D-Bus 1.4.14 (2011-07-29)
 +D-Bus 1.5.6 (2011-07-29)
  ==
  
 -The "Puny receptacle!" release.
 +The "weird, gravy-like aftertaste" release.
  
 -Changes:
 +In addition to new features and refactoring, this release contains all of the
 +bugfixes from 1.4.14.
 +
 +Potentially incompatible (Bustle and similar debugging tools will need
 +changes to work as intended):
 +
 +• Do not allow match rules to "eavesdrop" (receive messages intended for a
 +  different recipient) by mistake: eavesdroppers must now opt-in to this
 +  behaviour by putting "eavesdrop='true'" in the match rule, which will
 +  not have any practical effect on buses where eavesdropping is not allowed
 +  (fd.o #37890, Cosimo Alfarano)
 +
 +Other changes:
 +
 +• D-Bus Specification version 0.18 (fd.o #37890, fd.o #39450, fd.o #38252;
 +  Cosimo Alfarano, Simon McVittie)
 +  · add the "eavesdrop" keyword to match rules
 +  · define eavesdropping, unicast messages and broadcast messages
 +  · stop claiming that match rules are needed to match unicast messages to you
 +  · promote the type system to be a top-level section
  
  • Use DBUS_ERROR_OBJECT_PATH_IN_USE if dbus_connection_try_register_object_path
 -  or dbus_connection_try_register_fallback fails, not ...ADDRESS_IN_USE
 -  (fd.o #38874, Jiří Klimeš)
 +  or dbus_connection_try_register_fallback fails, not ...ADDRESS_IN_USE,
 +  and simplify object-path registration (fd.o #38874, Jiří Klimeš)
  
  • Consistently use atomic operations on everything that is ever manipulated
    via atomic ops, as was done for changes to DBusConnection's refcount in

diff --cc test/dbus-daemon.c
Simple merge