Simon McVittie [Tue, 27 Mar 2012 12:00:19 +0000 (13:00 +0100)]
Prepare version 1.4.20
Andoni Morales Alastruey [Wed, 14 Mar 2012 20:59:04 +0000 (21:59 +0100)]
Fix duplicate case value compiling with mingw-w64
In mingw-w64 both ESOMETHING and WSASOMETHING are defined,
leading to a duplicate case in the switch.
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47321
Martin Pitt [Mon, 23 Jan 2012 11:11:24 +0000 (11:11 +0000)]
Port to glib 2.31.x g_thread API
g_thread_init() is deprecated since glib 2.24, call g_type_init() instead.
Bump glib requirement accordingly.
g_thread_create is deprecated since 2.31, use g_thread_new() instead. When
building with a glib earlier than 2.31, provide a backwards compatibility shim.
[Added a comment about why we're using g_type_init() in a test that
doesn't otherwise use GObject -smcv]
[Applied to 1.4 despite just being a deprecation fix because it also fixes
linking with GLib 2.32, in which gthread has been removed from gobject's
Requires and moved to Requires.private, Debian #665665 -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44413
Bug-Debian: http://bugs.debian.org/665665
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Mon, 26 Sep 2011 10:20:41 +0000 (11:20 +0100)]
Enumerate data files used in the build rather than using find(1)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33840
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Mon, 20 Feb 2012 11:31:53 +0000 (11:31 +0000)]
NEWS for 1.4
Marc Mutz [Thu, 16 Feb 2012 07:43:40 +0000 (08:43 +0100)]
dbus-protocol.h: compile under C++11
C++11 compilers have a feature called 'user-defined string literals' which
allow arbitrary string suffixes to have user-defined meaning.
This makes code that concatenates macros with string literals without
intervening whitespace illegal under C++11. Fortunately, string literal
concatenation has allowed intervening whitespace since the dawn of time,
so the solution is to simply pad with spaces.
Tested (header) with GCC 4.7 (trunk).
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46147
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Mon, 13 Feb 2012 17:19:13 +0000 (17:19 +0000)]
Back to development status
Simon McVittie [Mon, 13 Feb 2012 16:23:50 +0000 (16:23 +0000)]
Release D-Bus 1.4.18
Pavel Strashkin [Mon, 23 Jan 2012 10:20:48 +0000 (10:20 +0000)]
dbus-daemon: fix forgotten counter increase while copying configured auth mechanisms
Previously, only one auth mechanism was used.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45106
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Mon, 13 Feb 2012 16:18:11 +0000 (16:18 +0000)]
Revert "dbus-daemon: fix forgotten counter increase while copying configured auth mechanisms"
This reverts commit
26b57efe43c991616186db5c499f729a900c6544.
It was incorrectly attributed.
Simon McVittie [Wed, 8 Feb 2012 19:06:30 +0000 (19:06 +0000)]
NEWS
Jack Nagel [Fri, 16 Dec 2011 06:21:21 +0000 (00:21 -0600)]
docs: correctly invoke man2html
man2html expects to find its input on stdin, so just passing the
filename will cause it to hang waiting for input.
[man2html 1.6g as shipped in Debian seems to be fine with files on the
command line, but apparently other versions aren't? -smcv]
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43875
Simon McVittie [Mon, 23 Jan 2012 11:13:42 +0000 (11:13 +0000)]
Don't warn about deprecated declarations in this stable branch
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44413
Simon McVittie [Mon, 23 Jan 2012 10:27:32 +0000 (10:27 +0000)]
Revert addition of files which were only meant to exist on master, too
This completes the reversion started in
5df8c3db12590edd68e968.
Simon McVittie [Mon, 23 Jan 2012 10:20:54 +0000 (10:20 +0000)]
update NEWS
Simon McVittie [Mon, 23 Jan 2012 10:20:48 +0000 (10:20 +0000)]
dbus-daemon: fix forgotten counter increase while copying configured auth mechanisms
Previously, only one auth mechanism was used.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45106
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Fri, 11 Nov 2011 11:48:20 +0000 (11:48 +0000)]
NEWS so far
eXeC001er [Fri, 11 Nov 2011 11:33:23 +0000 (11:33 +0000)]
Remove some dead code related to fd.o #37258
This would now just attempt to close fd -1, which is useless.
[commit message added by smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37258
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Wed, 4 Jan 2012 17:44:23 +0000 (17:44 +0000)]
Revert all changes since
a36d4918a6f646e085
Someone seems to have merged part of master into 1.4. Again. Let's go
back to the "last known good" point (the branch-point of some 1.4
branches I had locally), then we can cherry-pick the changes that
should have gone in.
Ralf Habacker [Sun, 25 Dec 2011 13:30:47 +0000 (14:30 +0100)]
1.4 branch need a fix to be compilable with msvc
Ralf Habacker [Thu, 22 Dec 2011 11:41:44 +0000 (12:41 +0100)]
keep cmake in sync with automake related to default bus addresses
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38201
Ralf Habacker [Wed, 21 Dec 2011 20:24:03 +0000 (21:24 +0100)]
windows fix: use install root as base path for relative pathes in dbus service file
Ralf Habacker [Wed, 21 Dec 2011 19:40:22 +0000 (20:40 +0100)]
Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4
Siraj Razick [Wed, 21 Dec 2011 18:25:35 +0000 (13:25 -0500)]
Adds a configure time key --with-dbus-session-bus-default-address
With this key we can specifiy the default session bus address
at compile time with autotool builds made with mingw32.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43639
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Ralf Habacker [Wed, 21 Dec 2011 19:22:53 +0000 (20:22 +0100)]
Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4
Simon McVittie [Thu, 15 Sep 2011 17:27:27 +0000 (18:27 +0100)]
corrupt test: compile successfully against older GLib (Debian stable)
We don't really need g_socket_send_with_blocking here.
Also, don't leak the GLib socket objects.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41219
Reviewed-by: Lennart Poettering <lennart@poettering.net>
Simon McVittie [Fri, 16 Sep 2011 14:01:40 +0000 (15:01 +0100)]
Set DBUS_TEST_HOMEDIR when running installcheck
This avoids spamming ~/.dbus and ~/.dbus-keyrings with filesystem activity
while running the tests.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41218
Reviewed-by: Lennart Poettering <lennart@poettering.net>
Simon McVittie [Thu, 3 Feb 2011 17:59:07 +0000 (17:59 +0000)]
_dbus_listen_tcp_socket: avoid leaking listen_fd in unlikely circumstances
If getaddrinfo (with port == 0) succeeds, the kernel gives us a port when
we first listen on a socket, we jump back to redo_lookup_with_port,
and getaddrinfo (with the nonzero port) fails, we leak listen_fd and all
the fds in it.
From the department of "without static analysis we'd never have spotted
this", or possibly "backward goto considered harmful".
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29881
Bug-NB: NB#180486 CID-2389
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Ralf Habacker [Fri, 28 Oct 2011 22:25:18 +0000 (00:25 +0200)]
refactored cmake version extracting from configure.ac
Ralf Habacker [Fri, 28 Oct 2011 19:22:53 +0000 (21:22 +0200)]
Optimized error handling of previous patch
Jesper Dam [Fri, 28 Oct 2011 13:54:30 +0000 (15:54 +0200)]
Find dbus-daemon executable next to dbus shared libaray on windows.
If the dbus shared library and the daemon executable are both in a dir
that is not part of the default search path and dbus-1.dll is dynamically
loaded with LoadLibrary(), it will fail to locate and launch the daemon
without this patch.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41558
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Fri, 16 Sep 2011 16:03:37 +0000 (17:03 +0100)]
Simplify substitution of test executables to use fewer variables
Also use EXEEXT in all the service files, even in the automake build
system.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
Simon McVittie [Fri, 16 Sep 2011 16:40:29 +0000 (17:40 +0100)]
Simplify generation of bus configuration files
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
Ralf Habacker [Sat, 24 Sep 2011 06:35:49 +0000 (08:35 +0200)]
Merge branch 'dbus-1.4'
Ralf Habacker [Fri, 23 Sep 2011 13:38:12 +0000 (15:38 +0200)]
Use dbus/dbus-arch-deps.h.in as source for cmake too
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41033
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 22 Sep 2011 19:26:43 +0000 (21:26 +0200)]
Merge branch 'dbus-1.4'
Conflicts:
cmake/CMakeLists.txt
Ralf Habacker [Sun, 22 May 2011 21:01:13 +0000 (23:01 +0200)]
Added cmake 'help-options' target to print out all available configure options
cherry-picked
5a0c5663ebf0b75503dfa6a60c01df07a29d3334
Ralf Habacker [Tue, 14 Jun 2011 16:45:46 +0000 (18:45 +0200)]
fixed cmake error: doc says CACHE needs type *and* doc string
cherry-picked
aba867f2422d06393f610c6cd8c6b147b4fd6c38
Ralf Habacker [Sat, 2 Jul 2011 22:54:20 +0000 (00:54 +0200)]
Limit batch file creating to windows
cherry-picked
84b03cae585274bfe54e2a234dff72469cef581d
Ralf Habacker [Thu, 22 Sep 2011 18:03:48 +0000 (20:03 +0200)]
Fixed cmake buildsystem - option command only supports boolean values
Conflicts:
cmake/CMakeLists.txt
cherry picked
4ee7b07b208f64f3b76f253c449e86e86849fca8 from master
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Tue, 20 Sep 2011 07:57:52 +0000 (09:57 +0200)]
cmake fix: generate build timestamp
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41029
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 22 Sep 2011 17:31:38 +0000 (19:31 +0200)]
Simplified cmake xml parser dependencies.
Find either expat or libxml2 xml parser libraries, depending on -DDBUS_USE_EXPAT=ON|OFF
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41027
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Wed, 21 Sep 2011 18:39:18 +0000 (19:39 +0100)]
Micro version
Simon McVittie [Wed, 21 Sep 2011 17:26:29 +0000 (18:26 +0100)]
Prepare version 1.5.8
Simon McVittie [Wed, 21 Sep 2011 17:21:09 +0000 (18:21 +0100)]
Merge branch 'dbus-1.4'
Conflicts:
NEWS
configure.ac
Simon McVittie [Wed, 21 Sep 2011 17:14:39 +0000 (18:14 +0100)]
Micro version
Simon McVittie [Wed, 21 Sep 2011 14:26:53 +0000 (15:26 +0100)]
Prepare version 1.4.16
Simon McVittie [Fri, 5 Aug 2011 12:55:48 +0000 (13:55 +0100)]
Enable more compiler warnings by default
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Wed, 21 Sep 2011 10:54:42 +0000 (11:54 +0100)]
refs test: fix unused variable
This one was added since my more-unused-39231 branch.
Simon McVittie [Wed, 21 Sep 2011 10:53:31 +0000 (11:53 +0100)]
Fix compilation of syslog test in master
Simon McVittie [Wed, 21 Sep 2011 10:45:12 +0000 (11:45 +0100)]
Merge branch 'more-unused-39231'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Wed, 21 Sep 2011 10:44:34 +0000 (11:44 +0100)]
Merge branch 'remove-stub-tests-41012'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41012
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Wed, 21 Sep 2011 10:39:32 +0000 (11:39 +0100)]
Merge branch 'dbus-1.4'
Conflicts:
NEWS
Simon McVittie [Wed, 21 Sep 2011 10:38:22 +0000 (11:38 +0100)]
NEWS
Simon McVittie [Thu, 21 Jul 2011 12:21:29 +0000 (13:21 +0100)]
update_desktop_file_entry: initialize return value properly, and actually return it
Since 1.4.4 (commit
75cfd97f) this function always returned FALSE. As far
as I can see this was actually harmless, because both of its callers
ignore any error that is not NoMemory (and treat it the same as success).
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Thu, 21 Jul 2011 12:12:15 +0000 (13:12 +0100)]
update_desktop_file_entry: if the service name already existed, set error
If we're going to return FALSE for this (which has apparently always
been the case), then we should set an error properly.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Thu, 21 Jul 2011 12:06:21 +0000 (13:06 +0100)]
update_desktop_file_entry: don't leak file_path on one particular OOM
Revenge of #33126: most, but not all, temporary variables were freed on
this code path.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Wed, 21 Sep 2011 10:25:40 +0000 (11:25 +0100)]
NEWS
Simon McVittie [Wed, 24 Aug 2011 11:24:28 +0000 (12:24 +0100)]
If --enable-tests=yes, require Python modules for complete test coverage
The two relevant tests already exit 0 with a message if importing those
modules fails.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Fri, 16 Sep 2011 09:50:01 +0000 (10:50 +0100)]
Only ask pkg-config for the systemd unit directory if both are installed
pkg-config is not a hard dependency, and this check avoids errors in a
minimal build environment:
./configure: line 21777: --variable=systemdsystemunitdir: command not found
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Wed, 24 Aug 2011 10:00:35 +0000 (11:00 +0100)]
Give better diagnostics if --enable-tests=yes is given
We want to indicate why it's a problem that GLib, dbus-glib are missing.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Wed, 24 Aug 2011 09:59:41 +0000 (10:59 +0100)]
Check for Python; skip Python tests if not found
As with the optional test-dependencies on GLib and dbus-glib, we make this
a hard dependency if --enable-tests[=yes], but not if --enable-tests=auto.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Tue, 21 Jun 2011 13:09:32 +0000 (14:09 +0100)]
Cope with platforms whose vsnprintf violates both POSIX and C99
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=11668
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Tue, 23 Aug 2011 15:14:21 +0000 (16:14 +0100)]
Add a semi-automatic test for _dbus_system_log
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39987
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Tue, 23 Aug 2011 15:10:03 +0000 (16:10 +0100)]
Cope with Unixes that don't have LOG_PERROR, like Solaris 10
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39987
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Fri, 5 Aug 2011 12:16:47 +0000 (13:16 +0100)]
Make "make -C test clean" idempotent
Previously, it'd fail when done twice, because you can't rmdir a
nonexistent directory.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40004
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Tue, 23 Aug 2011 11:05:00 +0000 (12:05 +0100)]
On Solaris, define CMSG_ALIGN, CMSG_LEN, CMSG_SPACE if undefined
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40235
Tested-by: Dagobert Michelsen <dam@opencsw.org>
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie [Tue, 20 Sep 2011 17:44:25 +0000 (18:44 +0100)]
Fix maintainer-upload-docs target to work out-of-tree
The STATIC_DOCS, DTDS and all dist_ files except XMLTO_OUTPUT are in the
source tree. The XMLTO_OUTPUT and the man2html output are in the build
tree, and the BONUS_FILES already have $(srcdir) in their names.
Also change the rules that generate the dbus-docs directory so that if
they fail, they leave behind a temporary directory, rather than leaving
behind a dbus-docs directory that causes make to not run those rules
if re-run; and change the rules to scp files to the server, to put a
trailing "/" on paths, ensuring that the tarball won't be uploaded as
"www" if the www directory doesn't already exist.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41047
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Ralf Habacker [Tue, 20 Sep 2011 17:37:39 +0000 (19:37 +0200)]
Merge branch 'dbus-1.4'
Ralf Habacker [Tue, 20 Sep 2011 06:42:31 +0000 (08:42 +0200)]
cmake fix: install version string
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40905
Simon McVittie [Wed, 22 Jun 2011 15:13:48 +0000 (16:13 +0100)]
_dbus_pending_call_test: remove stub
Simon McVittie [Wed, 22 Jun 2011 15:13:37 +0000 (16:13 +0100)]
_dbus_marshal_header_test: remove stub
Simon McVittie [Wed, 22 Jun 2011 14:53:09 +0000 (15:53 +0100)]
bus_policy_test: remove stub
Simon McVittie [Fri, 5 Aug 2011 12:43:12 +0000 (13:43 +0100)]
dbus-internals: make sure function-like macros expand to something non-empty
This avoids sometimes-surprising semantics, and also compiler warnings
when they're the only statement in an "if" or "else" clause, without {}.
Simon McVittie [Fri, 5 Aug 2011 12:40:44 +0000 (13:40 +0100)]
Use {}, not semicolon, when the statement of an "if" does nothing
The uses in bus/activation.c are also probably wrong because they ignore
the result of the test, but that's orthogonal.
(<https://bugs.freedesktop.org/show_bug.cgi?id=39858>)
Simon McVittie [Fri, 5 Aug 2011 12:25:14 +0000 (13:25 +0100)]
Fix an assortment of variables that aren't used when not checking/asserting
Simon McVittie [Fri, 5 Aug 2011 12:24:24 +0000 (13:24 +0100)]
BusConnections: don't assert about BusConnectionData in functions that don't need it
Simon McVittie [Fri, 5 Aug 2011 12:23:49 +0000 (13:23 +0100)]
bus_driver_handle_message: remove unused label
Simon McVittie [Fri, 5 Aug 2011 12:22:46 +0000 (13:22 +0100)]
activation helper: remove unused variable when not being verbose
Simon McVittie [Fri, 5 Aug 2011 12:22:18 +0000 (13:22 +0100)]
bus_registry_acquire_service: remove unnecessary variable
Simon McVittie [Fri, 5 Aug 2011 12:21:59 +0000 (13:21 +0100)]
Don't refcount TimeoutCallback
It turns out that timeout_callback_ref() is no longer called anywhere.
Simon McVittie [Fri, 5 Aug 2011 12:20:31 +0000 (13:20 +0100)]
Remove a never-used callback
Simon McVittie [Fri, 5 Aug 2011 12:20:16 +0000 (13:20 +0100)]
Remove more never-used variables
Simon McVittie [Fri, 26 Aug 2011 14:07:41 +0000 (15:07 +0100)]
Merge branch 'dbus-1.4'
Simon McVittie [Thu, 11 Aug 2011 10:02:40 +0000 (11:02 +0100)]
Don't build any of the reload-pipe code on non-Unix
In commit ab7b3f9, Ralf notes that handle_reload_watch() is (in principle)
cross-platform. However, there's no way to trigger it on Windows, because
nothing ever writes to the pipe. Make the entire pipe-to-self trick
Unix-specific instead.
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40002
Simon McVittie [Wed, 24 Aug 2011 10:26:13 +0000 (11:26 +0100)]
Merge branch 'dbus-1.4'
Simon McVittie [Wed, 24 Aug 2011 10:26:01 +0000 (11:26 +0100)]
NEWS
Simon McVittie [Wed, 24 Aug 2011 10:01:45 +0000 (11:01 +0100)]
Add missing inclusion of inttypes.h
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40313
Reviewed-by: Thiago Macieira <thiago@kde.org>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Mon, 15 Aug 2011 15:33:42 +0000 (17:33 +0200)]
Merge branch 'dbus-1.4'
Simon McVittie [Mon, 15 Aug 2011 08:52:04 +0000 (09:52 +0100)]
Fix compilation of (no-op) alignment assertions on non-gcc
do {} while (0) isn't valid at file scope, so the non-gcc code path
was broken; in particular, this affected MSVC.
Reviewed-by:Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Mon, 15 Aug 2011 09:26:48 +0000 (10:26 +0100)]
Merge branch 'dbus-1.4'
Simon McVittie [Mon, 15 Aug 2011 09:26:42 +0000 (10:26 +0100)]
NEWS
Chris Mayo [Mon, 15 Aug 2011 09:23:04 +0000 (10:23 +0100)]
Install diagrams in htmldir
diagram.png and diagram.svg are linked from dbus-tutorial.html but recent
changes to doc/Makefile.am mean that if htmldir is set with configure they are
installed such that the relative link from dbus-tutorial.html does not work.
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Mon, 15 Aug 2011 08:56:03 +0000 (09:56 +0100)]
Merge branch 'dbus-1.4'
Ralf Habacker [Sat, 13 Aug 2011 20:08:26 +0000 (22:08 +0200)]
Fix compilation on MSVC, which doesn't understand "inline" with its C99 meaning.
This fix is limited to msvc compilers only.
Reviewed-by:Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Fri, 12 Aug 2011 09:45:24 +0000 (10:45 +0100)]
NEWS
Simon McVittie [Fri, 12 Aug 2011 09:45:15 +0000 (10:45 +0100)]
dbus-daemon-eavesdrop test: apply the same Windows fixes as dbus-daemon test
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40003
Simon McVittie [Fri, 5 Aug 2011 12:14:54 +0000 (13:14 +0100)]
Fix linking of libdbus-testutils.la with Automake targeting Windows
This regressed in commit
9875480ed - libdbus-testutils.la needs static
linking too.
Simon McVittie [Fri, 12 Aug 2011 09:26:13 +0000 (10:26 +0100)]
Merge branch 'dbus-1.4'
Simon McVittie [Fri, 12 Aug 2011 09:26:04 +0000 (10:26 +0100)]
NEWS