From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 26 Jul 2011 10:51:13 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.6~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a6e7cb982d6ed5e3d4b3ecb8be21588b93487cc;p=platform%2Fupstream%2Fdbus.git

Merge branch 'dbus-1.4'
---

0a6e7cb982d6ed5e3d4b3ecb8be21588b93487cc
diff --cc NEWS
index bcb4358,ebfb648..1678fed
--- a/NEWS
+++ b/NEWS
@@@ -1,24 -1,16 +1,25 @@@
 -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
-   and DBusServer, as was done for DBusConnection in 1.4.12 (fd.o #38005,
-   Simon McVittie)
+ • 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)
  
  • Fix a file descriptor leak when connecting to a TCP socket (fd.o #37258,
    Simon McVittie)