Merge branch 'dbus-1.4'

Conflicts:
	dbus/dbus-message.c

diff --cc NEWS
index 1678fed,42ea78b..05ddf05
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,25 -1,15 +1,24 @@@
 -D-Bus 1.4.14 (UNRELEASED)
 +D-Bus 1.5.6 (UNRELEASED)
  ==
  
 -Changes:
 +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:
  
  • 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 the refcounts of DBusPendingCall,
-   DBusServer, DBusMessageFilter and DBusObjectTree, as was done for
-   DBusConnection in 1.4.12, and make the use of atomic operations
-   more thorough for DBusConnection (fd.o #38005, Simon McVittie)
+ • Consistently use atomic operations on everything that is ever manipulated
+   via atomic ops, as was done for changes to DBusConnection's refcount in
+   1.4.12 (fd.o #38005, Simon McVittie)
  
  • Fix a file descriptor leak when connecting to a TCP socket (fd.o #37258,
    Simon McVittie)

diff --cc dbus/dbus-message.c
index d909171,a95ad0f..dcb8d08
--- 1/dbus/dbus-message.c
--- 2/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@@ -1093,8 -1089,10 +1094,9 @@@ dbus_message_new_empty_header (void
        message->n_unix_fds_allocated = 0;
  #endif
      }
-   
-   message->refcount.value = 1;
+ 
+   _dbus_atomic_inc (&message->refcount);
+ 
 -  message->byte_order = DBUS_COMPILER_BYTE_ORDER;
    message->locked = FALSE;
  #ifndef DBUS_DISABLE_CHECKS
    message->in_cache = FALSE;
@@@ -1457,7 -1450,8 +1459,8 @@@ dbus_message_copy (const DBusMessage *m
    if (retval == NULL)
      return NULL;
  
-   retval->refcount.value = 1;
+   _dbus_atomic_inc (&retval->refcount);
 -  retval->byte_order = message->byte_order;
++
    retval->locked = FALSE;
  #ifndef DBUS_DISABLE_CHECKS
    retval->generation = message->generation;