platform/upstream/dbus.git
13 years agospec: make the Match Rules section true again
Simon McVittie [Thu, 21 Jul 2011 15:14:02 +0000 (16:14 +0100)]
spec: make the Match Rules section true again

The spec previously claimed that only messages matching the client's
match rules would be received. This is not actually true: messages
listing a client as their DESTINATION are always delivered (security
policy permitting).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39450
Reviewed-by: Thiago Macieira <thiago@kde.org>
13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Fri, 29 Jul 2011 15:28:32 +0000 (16:28 +0100)]
Merge branch 'dbus-1.4'

Conflicts:
NEWS
configure.ac

13 years agomicro version
Simon McVittie [Fri, 29 Jul 2011 15:17:32 +0000 (16:17 +0100)]
micro version

13 years ago1.4.14 dbus-1.4.14
Simon McVittie [Fri, 29 Jul 2011 13:28:54 +0000 (14:28 +0100)]
1.4.14

13 years agoNEWS for 1.5
Simon McVittie [Fri, 29 Jul 2011 12:43:09 +0000 (13:43 +0100)]
NEWS for 1.5

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Fri, 29 Jul 2011 11:52:32 +0000 (12:52 +0100)]
Merge branch 'dbus-1.4'

Conflicts:
NEWS

13 years agoNEWS
Simon McVittie [Fri, 29 Jul 2011 11:51:42 +0000 (12:51 +0100)]
NEWS

13 years agoImplement _dbus_atomic_get directly, rather than via inc + dec
Simon McVittie [Thu, 28 Jul 2011 15:58:05 +0000 (16:58 +0100)]
Implement _dbus_atomic_get directly, rather than via inc + dec

The Windows implementation is untested, but does at least (cross-)compile,
and matches what GLib does.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005
Reviewed-by: Lennart Poettering <lennart@poettering.net>
13 years agoRemove remnants of dbus-viewer
Simon McVittie [Wed, 15 Jun 2011 13:37:47 +0000 (14:37 +0100)]
Remove remnants of dbus-viewer

Parts of it were already missing, it wasn't compiled, and it depends on
dbus-glib and Gtk.

13 years agotools: use AM_CPPFLAGS, and wrap its lines
Simon McVittie [Wed, 15 Jun 2011 13:30:13 +0000 (14:30 +0100)]
tools: use AM_CPPFLAGS, and wrap its lines

13 years agotest, test/name-test: remove SOURCES where they can be inferred from the name of...
Simon McVittie [Wed, 15 Jun 2011 13:27:34 +0000 (14:27 +0100)]
test, test/name-test: remove SOURCES where they can be inferred from the name of the executable

13 years agotest/name-test: remove useless CFLAGS
Simon McVittie [Wed, 15 Jun 2011 13:25:54 +0000 (14:25 +0100)]
test/name-test: remove useless CFLAGS

13 years agotest/name-test: use AM_CPPFLAGS instead of INCLUDES
Simon McVittie [Wed, 15 Jun 2011 13:25:43 +0000 (14:25 +0100)]
test/name-test: use AM_CPPFLAGS instead of INCLUDES

13 years agodbus: use AM_CPPFLAGS
Simon McVittie [Wed, 15 Jun 2011 13:23:58 +0000 (14:23 +0100)]
dbus: use AM_CPPFLAGS

13 years agotest: promote GLIB_CFLAGS, DBUS_GLIB_CFLAGS to top level and use AM_CPPFLAGS
Simon McVittie [Wed, 15 Jun 2011 13:22:42 +0000 (14:22 +0100)]
test: promote GLIB_CFLAGS, DBUS_GLIB_CFLAGS to top level and use AM_CPPFLAGS

INCLUDES is a deprecated way to get the same effect as AM_CPPFLAGS.

It's harmless to add extra -I directories to all the tests, even those
that use neither GLib nor dbus-glib, so we can simplify by setting these
AM_CPPFLAGS for the whole directory.

13 years agotest: reverse assumption regarding static/dynamic linking
Simon McVittie [Wed, 15 Jun 2011 13:21:14 +0000 (14:21 +0100)]
test: reverse assumption regarding static/dynamic linking

If we change the default assumption to be that new tests will be
dynamically-linked to libdbus, those tests can be useful for
installcheck or even for installation. Accordingly, explicitly use
new variable $(static_cppflags) for all tests that need static linking.

13 years agobus: use AM_CPPFLAGS to simplify preprocessor invocation
Simon McVittie [Wed, 15 Jun 2011 13:14:34 +0000 (14:14 +0100)]
bus: use AM_CPPFLAGS to simplify preprocessor invocation

Everything in this directory is statically linked to libdbus-internal,
so we can make -DDBUS_STATIC_BUILD global. Also, merge INCLUDES into
AM_CPPFLAGS (it's an older name for the same functionality).

13 years agoSimplify linking for tests that use libdbus-testutils
Simon McVittie [Wed, 15 Jun 2011 10:50:33 +0000 (11:50 +0100)]
Simplify linking for tests that use libdbus-testutils

This is the library used by tests that link libdbus-internal and DBusLoop.
By linking libdbus-internal into it, we can avoid having to repeat that
dependency all over the place - libtool and cmake both know how to follow
recursive dependencies.

In cmake, also use libdbus-testutils for more tests, in preference to
repeating its source files.

13 years agoDon't explicitly link thread and network libs into various tests
Simon McVittie [Wed, 15 Jun 2011 10:41:27 +0000 (11:41 +0100)]
Don't explicitly link thread and network libs into various tests

These tests get everything they need from the public or internal API of
libdbus-internal.la, and libtool knows how to pull in libraries'
dependencies, so we don't need explicit linking.

spawn-test and break-loader don't actually need test-utils.[ch]
either.

13 years agoRename DBUS_CLIENT_LIBS to LIBDBUS_LIBS to more accurately reflect its meaning
Simon McVittie [Fri, 29 Jul 2011 10:09:02 +0000 (11:09 +0100)]
Rename DBUS_CLIENT_LIBS to LIBDBUS_LIBS to more accurately reflect its meaning

This does still need to be in configure.ac, because it's common to
dbus/Makefile.am (linking the static/shared library) and dbus-1*.pc.in
(telling static library users which additional libraries they must link).

13 years agotools: simplify linking
Simon McVittie [Wed, 15 Jun 2011 09:34:49 +0000 (10:34 +0100)]
tools: simplify linking

* dbus-send, dbus-uuidgen only need to link libdbus; libtool knows what
  extra libraries libdbus depends on
* dbus-monitor uses a Winsock header (on Windows) so it needs
  NETWORK_libs,but still doesn't need threads
* dbus-launch needs X (on Unix) but doesn't directly need threads or
  networking

13 years agotools: put bin_PROGRAMS one per line, eliminate unnecessary variable
Simon McVittie [Wed, 15 Jun 2011 09:30:13 +0000 (10:30 +0100)]
tools: put bin_PROGRAMS one per line, eliminate unnecessary variable

13 years agoMove knowledge of what the bus daemon/launcher need to link into bus/
Simon McVittie [Tue, 14 Jun 2011 16:44:35 +0000 (17:44 +0100)]
Move knowledge of what the bus daemon/launcher need to link into bus/

13 years agoSubstitute cflags/libs per-library
Simon McVittie [Tue, 14 Jun 2011 16:40:07 +0000 (17:40 +0100)]
Substitute cflags/libs per-library

This means each module can link whatever it needs to, localizing the
knowledge of which module needs which libraries into its own
Makefile.am.

13 years agoStop defining DBUS_API_SUBJECT_TO_CHANGE
Simon McVittie [Tue, 14 Jun 2011 16:20:50 +0000 (17:20 +0100)]
Stop defining DBUS_API_SUBJECT_TO_CHANGE

Seriously.

13 years agodbus: remove export_symbols_internal, it will always be empty
Simon McVittie [Tue, 14 Jun 2011 15:56:13 +0000 (16:56 +0100)]
dbus: remove export_symbols_internal, it will always be empty

The whole point of libdbus-internal.la is that it exports all its symbols.

13 years agoSimplify linking by moving -export-dynamic to AM_LDFLAGS
Simon McVittie [Wed, 15 Jun 2011 10:32:29 +0000 (11:32 +0100)]
Simplify linking by moving -export-dynamic to AM_LDFLAGS

13 years agoRemove DBUS_GLIB_CFLAGS from name-test subdirectory (not used/needed)
Simon McVittie [Tue, 14 Jun 2011 15:37:24 +0000 (16:37 +0100)]
Remove DBUS_GLIB_CFLAGS from name-test subdirectory (not used/needed)

This appears to be left over from when dbus-glib was part of dbus.

13 years agoRemove DBUS_CLIENT_CFLAGS, which is always empty
Simon McVittie [Tue, 14 Jun 2011 15:36:14 +0000 (16:36 +0100)]
Remove DBUS_CLIENT_CFLAGS, which is always empty

13 years agoRemove DBUS_TEST_CFLAGS, which is empty
Simon McVittie [Tue, 14 Jun 2011 15:35:08 +0000 (16:35 +0100)]
Remove DBUS_TEST_CFLAGS, which is empty

13 years agoRemove leftover reference to dbus-md5.[ch]
Simon McVittie [Wed, 15 Jun 2011 10:24:29 +0000 (11:24 +0100)]
Remove leftover reference to dbus-md5.[ch]

13 years agoRemove declarations for tests that no longer exist
Simon McVittie [Wed, 15 Jun 2011 10:24:16 +0000 (11:24 +0100)]
Remove declarations for tests that no longer exist

13 years agoFix compilation for removal of link cache
Simon McVittie [Fri, 29 Jul 2011 09:45:43 +0000 (10:45 +0100)]
Fix compilation for removal of link cache

13 years agoMerge branch 'dbus-1.4'
Lennart Poettering [Thu, 28 Jul 2011 19:45:35 +0000 (21:45 +0200)]
Merge branch 'dbus-1.4'

13 years agosysdeps-unix: remove some redundant assignments
Lennart Poettering [Thu, 28 Jul 2011 03:36:33 +0000 (05:36 +0200)]
sysdeps-unix: remove some redundant assignments

13 years agoMerge branch 'dbus-1.4'
Lennart Poettering [Thu, 28 Jul 2011 19:26:21 +0000 (21:26 +0200)]
Merge branch 'dbus-1.4'

13 years agoactivation: add /lib/dbus-1/system-services to the search path for services
Lennart Poettering [Fri, 11 Mar 2011 02:03:03 +0000 (03:03 +0100)]
activation: add /lib/dbus-1/system-services to the search path for services

In order to allow D-Bus usage during early boot (where /usr is not
accessible) also search for bus activation files in
/lib/dbus-1/system-services/. This is only a first step in the right
direction, before we really can boot without /usr we'd need to move all
current activation files (or possibly replace
/usr/dbus-1/system-services to a symlink to
/lib/dbus-1/system-services).

13 years ago_dbus_message_remove_counter: remove ability to return the link
Simon McVittie [Fri, 29 Apr 2011 15:01:59 +0000 (16:01 +0100)]
_dbus_message_remove_counter: remove ability to return the link

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agoAdd a regression test that can reproduce fd.o #34393
Simon McVittie [Fri, 11 Mar 2011 13:24:08 +0000 (13:24 +0000)]
Add a regression test that can reproduce fd.o #34393

The number of messages is arbitrary; the more messages, the more likely
the crash is. 2000 messages seem to cause it reliably on this laptop,
but I've set it to 10000 to be safe.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agoRemove the per-connection link cache
Simon McVittie [Fri, 29 Apr 2011 14:08:53 +0000 (15:08 +0100)]
Remove the per-connection link cache

With fd.o#34393 fixed, retaking the lock to cache unused links
significantly adds to locking overhead (-18% throughput in a synthetic
benchmark on an ARM device). The cache is also unlimited in size, and
probably contributes to memory growth and fragmentation by not being
under the system malloc's control.

Fixing fd.o #34393, but also dropping this cache entirely, turns out to
lead to a 5% increase in throughput on the same synthetic benchmark.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agodbus_connection_dispatch: avoid freeing UnknownMethod reply until we unlock
Simon McVittie [Fri, 25 Feb 2011 18:11:51 +0000 (18:11 +0000)]
dbus_connection_dispatch: avoid freeing UnknownMethod reply until we unlock

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years ago_dbus_connection_peer_filter_unlocked_no_update: delay freeing reply
Simon McVittie [Fri, 25 Feb 2011 18:10:59 +0000 (18:10 +0000)]
_dbus_connection_peer_filter_unlocked_no_update: delay freeing reply

Finalizing the reply could conceivably call callbacks, so wait til we
unlock.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agoDon't finalize sent or dispatched messages while under the connection lock
Simon McVittie [Fri, 25 Feb 2011 17:46:54 +0000 (17:46 +0000)]
Don't finalize sent or dispatched messages while under the connection lock

Finalizing a message can trigger callbacks; that's bad, if we have a
connection locked.

In particular, if a message is received by the "left side", passed to
the "right side" and sent (as in test/relay.c (see the diagram there)
or in dbus-daemon), then finalizing that message could result in the
live messages counter for the left side, and the outgoing messages counter
for the right side, both being decremented while under either side's
lock.

After a message is dispatched on the left side, finalizing it now drops
the lock temporarily, to avoid this problem.

After a message is sent on the right side, finalizing it is now deferred
until the right side unlocks, by moving it to a new queue of
"expired messages" which is automatically cleared every time we release
the lock.

The "live messages" counter for the "left" connection will now explicitly
take the left connection's lock before decrementing, to avoid
manipulating watches without a lock.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agoDon't inline the contents of _dbus_connection_unlock
Simon McVittie [Fri, 25 Feb 2011 17:32:38 +0000 (17:32 +0000)]
Don't inline the contents of _dbus_connection_unlock

It's about to become more complex, to handle delayed deallocation of
messages in order to avoid triggering callbacks while locked.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agoWhen attaching counters to messages, don't automatically notify callbacks
Simon McVittie [Fri, 25 Feb 2011 17:21:44 +0000 (17:21 +0000)]
When attaching counters to messages, don't automatically notify callbacks

In all the places where counters are added, we're under a lock. The caller
knows what effect adding the counter might have, and can replicate it
in a lock-safe way if necessary.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agoComment some places where it's OK to unref a message despite holding locks
Simon McVittie [Fri, 25 Feb 2011 17:08:59 +0000 (17:08 +0000)]
Comment some places where it's OK to unref a message despite holding locks

In general, dbus_message_unref should be avoided while holding locks,
because it can invoke arbitrary user callbacks (via attached data, or
via DBusCounter).

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agoAdd _dbus_counter_notify and call it after every adjustment
Simon McVittie [Wed, 23 Feb 2011 12:45:53 +0000 (12:45 +0000)]
Add _dbus_counter_notify and call it after every adjustment

When fd-passing is implemented, adjustments happen in pairs; in that case
we coalesce the two calls into one.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years ago_dbus_connection_message_sent: rename to _unlocked
Simon McVittie [Tue, 22 Feb 2011 18:50:02 +0000 (18:50 +0000)]
_dbus_connection_message_sent: rename to _unlocked

It's called with the connection's lock held.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agodbus_bus_register: don't unref the messages with the lock held
Simon McVittie [Tue, 22 Feb 2011 18:49:29 +0000 (18:49 +0000)]
dbus_bus_register: don't unref the messages with the lock held

Finalizing a message can call out to user code via dbus_message_set_data
(or to internal code not expecting locks to be held, via DBusCounter).

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Thu, 28 Jul 2011 15:24:11 +0000 (16:24 +0100)]
Merge branch 'dbus-1.4'

13 years agoAdd a note about bootstrapping new platforms to README
Simon McVittie [Thu, 28 Jul 2011 15:23:19 +0000 (16:23 +0100)]
Add a note about bootstrapping new platforms to README

13 years agoUpgrade the type system into its own top-level section of the spec
Simon McVittie [Tue, 26 Apr 2011 16:37:21 +0000 (17:37 +0100)]
Upgrade the type system into its own top-level section of the spec

The type system can be used independently, for instance in GVariant
(although GVariant's binary encoding is in fact not the same).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38252
Reviewed-by: Lennart Poettering <lennart@poettering.net>
13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Thu, 28 Jul 2011 10:32:46 +0000 (11:32 +0100)]
Merge branch 'dbus-1.4'

13 years agoman pages: replace all unescaped hyphen/minus characters with \-
Simon McVittie [Tue, 14 Jun 2011 09:10:24 +0000 (10:10 +0100)]
man pages: replace all unescaped hyphen/minus characters with \-

In a man page, "-" officially means a typographical (Unicode) hyphen,
which frequently breaks the ability to copy and paste code examples from
a man page. "\-" means the ASCII hyphen/minus character. See
<http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html> for
more details.

Rather than trying to distinguish between hyphens, em-dashes and
hyphen/minus, I just replaced all ambiguous hyphens with \- by applying
this vim command repeatedly until it didn't find anything:

     %s/\(^\|[^\\]\)-/\1\\-/g

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38284
Reviewed-by: Lennart Poettering <lennart@poettering.net>
13 years agoFix spelling/grammatical mistakes detected by Debian's lintian(1)
Simon McVittie [Fri, 10 Jun 2011 15:45:34 +0000 (16:45 +0100)]
Fix spelling/grammatical mistakes detected by Debian's lintian(1)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38284
Reviewed-by: Lennart Poettering <lennart@poettering.net>
13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Wed, 27 Jul 2011 17:54:35 +0000 (18:54 +0100)]
Merge branch 'dbus-1.4'

13 years agolist_allows_user: fix debug output for groups
Sascha Silbe [Sun, 17 Oct 2010 12:38:20 +0000 (14:38 +0200)]
list_allows_user: fix debug output for groups

Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Tue, 26 Jul 2011 17:00:57 +0000 (18:00 +0100)]
Merge branch 'dbus-1.4'

Conflicts:
dbus/dbus-message.c

13 years agoNEWS
Simon McVittie [Tue, 26 Jul 2011 16:59:23 +0000 (17:59 +0100)]
NEWS

13 years agoDBusMessage: always access refcount atomically, even for assertions/initial ref
Simon McVittie [Thu, 14 Jul 2011 16:20:21 +0000 (17:20 +0100)]
DBusMessage: always access refcount atomically, even for assertions/initial ref

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years agodbus-memory: use atomic accesses to block count, even for assertions
Simon McVittie [Thu, 14 Jul 2011 16:26:52 +0000 (17:26 +0100)]
dbus-memory: use atomic accesses to block count, even for assertions

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Tue, 26 Jul 2011 10:51:13 +0000 (11:51 +0100)]
Merge branch 'dbus-1.4'

13 years agoNEWS
Simon McVittie [Tue, 26 Jul 2011 10:51:04 +0000 (11:51 +0100)]
NEWS

13 years agoDBusConnection: use atomic accesses to refcount in assertions/initial ref
Simon McVittie [Thu, 14 Jul 2011 16:23:21 +0000 (17:23 +0100)]
DBusConnection: use atomic accesses to refcount in assertions/initial ref

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years agodbus_message_ref: avoid unused variable if not asserting
Simon McVittie [Thu, 14 Jul 2011 16:14:29 +0000 (17:14 +0100)]
dbus_message_ref: avoid unused variable if not asserting

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years ago_dbus_connection_close_if_only_one_ref: use _dbus_atomic_get
Simon McVittie [Thu, 14 Jul 2011 16:14:06 +0000 (17:14 +0100)]
_dbus_connection_close_if_only_one_ref: use _dbus_atomic_get

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years agoAdd _dbus_atomic_get implemented in terms of inc, dec
Simon McVittie [Thu, 14 Jul 2011 16:07:08 +0000 (17:07 +0100)]
Add _dbus_atomic_get implemented in terms of inc, dec

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years agoDBusObjectTree: always access refcount atomically
Simon McVittie [Thu, 23 Jun 2011 12:39:00 +0000 (13:39 +0100)]
DBusObjectTree: always access refcount atomically

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years agodbus_message_unref: make an assertion more strict
Simon McVittie [Thu, 23 Jun 2011 12:38:31 +0000 (13:38 +0100)]
dbus_message_unref: make an assertion more strict

We've just decremented the refcount, so it should have been at least 1
before we did that.

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years agoDBusMessageFilter: exclusively use atomic accesses to refcount
Simon McVittie [Thu, 23 Jun 2011 12:35:55 +0000 (13:35 +0100)]
DBusMessageFilter: exclusively use atomic accesses to refcount

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005

13 years agoMerge branch 'dbus-1.4' and update NEWS for master
Simon McVittie [Mon, 18 Jul 2011 18:42:35 +0000 (19:42 +0100)]
Merge branch 'dbus-1.4' and update NEWS for master

Conflicts:
NEWS

13 years agoNEWS
Simon McVittie [Mon, 18 Jul 2011 18:33:00 +0000 (19:33 +0100)]
NEWS

13 years agoUninstall the installed docs
Simon McVittie [Tue, 12 Apr 2011 12:17:30 +0000 (13:17 +0100)]
Uninstall the installed docs

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36156
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoInstall man2html output to $(htmldir)
Simon McVittie [Tue, 12 Apr 2011 12:08:22 +0000 (13:08 +0100)]
Install man2html output to $(htmldir)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36156
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoInstall diagram.*, system-activation.txt to the $(docdir)
Simon McVittie [Tue, 12 Apr 2011 12:06:25 +0000 (13:06 +0100)]
Install diagram.*, system-activation.txt to the $(docdir)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36156
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoInstall xmlto output to $(htmldir) automatically
Simon McVittie [Tue, 12 Apr 2011 12:01:44 +0000 (13:01 +0100)]
Install xmlto output to $(htmldir) automatically

Also rename HTML_FILES to XMLTO_OUTPUT, as a more self-describing name:
we have other HTML files which are not the output from xmlto.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36156
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoInstall dbus.devhelp to $(htmldir), not $(apidir), and remove it in clean
Simon McVittie [Tue, 12 Apr 2011 11:54:22 +0000 (12:54 +0100)]
Install dbus.devhelp to $(htmldir), not $(apidir), and remove it in clean

It needs to be in $(htmldir) so that its relative paths will work.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36156
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoconfigure.ac: fix check for xsltproc
Simon McVittie [Tue, 12 Apr 2011 11:52:30 +0000 (12:52 +0100)]
configure.ac: fix check for xsltproc

Pre-setting XSLTPROC interferes with AC_CHECK_PROGS letting the user
override choice of program via the environment.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36156

13 years agoUse EXEEXT when running tests from another directory, and skip bus-test-launch-helper...
Simon McVittie [Wed, 15 Jun 2011 11:43:15 +0000 (12:43 +0100)]
Use EXEEXT when running tests from another directory, and skip bus-test-launch-helper on non-Unix

This is necessary when cross-compiling from Linux to mingw32 and running
the resulting tests under Wine. (This partially works! Some tests fail,
though.)

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoBuild docs after running tests, and remove redundant DIST_SUBDIRS
Simon McVittie [Mon, 6 Jun 2011 15:12:05 +0000 (16:12 +0100)]
Build docs after running tests, and remove redundant DIST_SUBDIRS

If DIST_SUBDIRS isn't set, it defaults to SUBDIRS, so it's just noise.

Running tests before building documentation is an easy way to speed up the
hack/make check/fix cycle, by not wasting time rebuilding the
documentation (which is often slow) until all the tests compile and pass.

https://bugs.freedesktop.org/show_bug.cgi?id=34405
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoRun bus tests from test/
Simon McVittie [Mon, 13 Jun 2011 10:11:31 +0000 (11:11 +0100)]
Run bus tests from test/

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoRun dbus-test from test/, not dbus/
Simon McVittie [Mon, 13 Jun 2011 10:08:28 +0000 (11:08 +0100)]
Run dbus-test from test/, not dbus/

This avoids failures caused by test/data not having been set up yet.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agodbus tests: don't warn on skipped tests
Simon McVittie [Mon, 6 Jun 2011 14:57:45 +0000 (15:57 +0100)]
dbus tests: don't warn on skipped tests

We should treat _dbus_warn as fatal when we run tests, like bus/ does.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agotest/Makefile.am: list tests one per line
Simon McVittie [Mon, 6 Jun 2011 14:01:52 +0000 (15:01 +0100)]
test/Makefile.am: list tests one per line

This improves clarity, and makes conflicts less likely and merges more
obviously correct.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoOpt-in to modern OS features on Solaris, to get file descriptor passing
Simon McVittie [Wed, 26 Jan 2011 18:24:03 +0000 (18:24 +0000)]
Opt-in to modern OS features on Solaris, to get file descriptor passing

Surely it's broken to define SCM_RIGHTS but not the necessary structs to
do something useful with it, but whatever.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33465
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years ago_dbus_open_unix_socket: make static
Simon McVittie [Wed, 22 Jun 2011 11:31:24 +0000 (12:31 +0100)]
_dbus_open_unix_socket: make static

It isn't called from outside its translation unit.

13 years ago_dbus_open_tcp_socket: remove
Simon McVittie [Wed, 22 Jun 2011 11:31:08 +0000 (12:31 +0100)]
_dbus_open_tcp_socket: remove

It's only implemented on Unix, internal to dbus, and never called.

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Mon, 18 Jul 2011 14:15:45 +0000 (15:15 +0100)]
Merge branch 'dbus-1.4'

13 years ago_dbus_connect_tcp_socket_with_nonce: don't create an extra fd (which is then leaked)
Simon McVittie [Wed, 22 Jun 2011 10:59:32 +0000 (11:59 +0100)]
_dbus_connect_tcp_socket_with_nonce: don't create an extra fd (which is then leaked)

This block should have been deleted in 2007, when IPv6 support was added:
previously, the fd allocated at the beginning of the function was used
for connect(), but for IPv6 support, the socket() call has to be inside
the loop over getaddrinfo() results so its address family can be changed.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37258
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Thu, 14 Jul 2011 15:49:02 +0000 (16:49 +0100)]
Merge branch 'dbus-1.4'

13 years agoDBusServer: exclusively use atomic operations on the refcount
Simon McVittie [Thu, 23 Jun 2011 12:22:44 +0000 (13:22 +0100)]
DBusServer: exclusively use atomic operations on the refcount

Same reasoning as for fd.o #38005, commit 50732523a7.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005
Bug-NB: NB#263436

13 years agoDBusPendingCall: exclusively use atomic operations on the refcount
Simon McVittie [Thu, 23 Jun 2011 12:08:14 +0000 (13:08 +0100)]
DBusPendingCall: exclusively use atomic operations on the refcount

Same reasoning as for fd.o #38005, commit 50732523a7.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005
Bug-NB: NB#263436

13 years agoAdd testsuite for eavesdrop=true DBusMatchRule
Cosimo Alfarano [Wed, 13 Jul 2011 17:05:32 +0000 (18:05 +0100)]
Add testsuite for eavesdrop=true DBusMatchRule

[with some typos fixed during commit -smcv]

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37890
Bug-NB: NB#269748

13 years agoFix dbus-monitor using eavesdrop=true when no filters are passed
Cosimo Alfarano [Tue, 12 Jul 2011 14:56:43 +0000 (15:56 +0100)]
Fix dbus-monitor using eavesdrop=true when no filters are passed

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoDBusHeader: only store byte-order in the fixed-length header
Simon McVittie [Fri, 10 Jun 2011 09:12:07 +0000 (10:12 +0100)]
DBusHeader: only store byte-order in the fixed-length header

Reviewed-by: Thiago Macieira <thiago@kde.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38287

13 years agoDBusMessage: don't redundantly store byte order, ask the DBusHeader
Simon McVittie [Fri, 10 Jun 2011 09:10:54 +0000 (10:10 +0100)]
DBusMessage: don't redundantly store byte order, ask the DBusHeader

Reviewed-by: Thiago Macieira <thiago@kde.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38287

13 years agoAdd "eavesdrop=true" as constant match rule for dbus-monitor
Cosimo Alfarano [Thu, 7 Jul 2011 15:10:54 +0000 (16:10 +0100)]
Add "eavesdrop=true" as constant match rule for dbus-monitor

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37890
Bug-NB: NB#269748
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoDo not allow eavedropping unless rule owner explicitely declare it
Cosimo Alfarano [Mon, 11 Jul 2011 16:03:00 +0000 (17:03 +0100)]
Do not allow eavedropping unless rule owner explicitely declare it

Adds "eavesdrop=true" as a match rule, meaning that the owner
intend to eavedrop.
Otherwise the owner will receive only broadcasted messages and the ones
meant to be delivered to it.

[plus a typo fix in an error message -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37890
Bug-NB: NB#269748
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoMerge remote-tracking branch 'origin/dbus-1.4'
Simon McVittie [Mon, 11 Jul 2011 12:23:38 +0000 (13:23 +0100)]
Merge remote-tracking branch 'origin/dbus-1.4'

13 years agoDBusConnection: simplify registering object paths code
Jiří Klimeš [Fri, 1 Jul 2011 11:59:48 +0000 (13:59 +0200)]
DBusConnection: simplify registering object paths code

Introduce static generic _dbus_connection_register_object_path()
function to remove duplicate code for registration object paths.
Having *four* almost the same functions is error-prone and hard
to follow as well.

Signed-off-by: Jiří Klimeš <jklimes@redhat.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38874