diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2005-09-06 22:38:54 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2005-09-06 22:38:54 +0000 |
| commit | bc564a69c26419a125eb1880069d9276a47f7d1b (patch) | |
| tree | f5e5bc7615d0fd4f9b84ebf0001761ef3dd4636c /bus/activation.c | |
| parent | bbc0cee63702cc344fa399c4ca4e45756bb0b721 (diff) | |
* Released 0.50dbus-0.50
* Patch from Steve Grubb:
- bus/activation.c (bus_activation_service_reload_test): clean up
some indentation
- dbus/dbus-keyring.c (_dbus_keyring_reload): fix conditional
- dbus/dbus-message-factory.c (generate_special): fix a couple of
buffer overflows in the test suite. This is non critical because
it can not be exploited and this code is only run when doing a
make check.
* Patch from Yaakov Selkowitz: Build fixes for Cygwin
- configure.in: Don't check and link against kdecore, only qt headers
- dbus/Makefile.am: Add -no-undefined to libdbus_1_la_LDFLAGS
- gcj/org/freedesktop/dbus/Makefile.am:
add libdbus_gcj_1_la_LDFLAGS = -no-undefined
- glib/Makefile.am: Add -no-undefined to libdbus_glib_1_la_LDFLAGS
and $(DBUS_GLIB_LIBS) to dbus_binding_tool_LDADD
- qt/Makefile.am: Add -no-undefined to libdbus_qt_1_la_LDFLAGS
- tools/Makefile.am: Add platform extentions to binaries
(i.e. .exe on windows)
* configure.in:
- Make it so if no suitable version of python is found we only
disable building python instead of exiting the configure script
- Require version 2.4 of glib for glib bindings
- Up version to 0.50
* python/__init__.py: Sync version with libdbus to (0,50,0)
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bus/activation.c b/bus/activation.c index 2faa42b4..43a135fc 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -1886,13 +1886,15 @@ bus_activation_service_reload_test (const DBusString *test_data_dir) if (!init_service_reload_test (&directory)) _dbus_assert_not_reached ("could not initiate service reload test"); - if (!do_service_reload_test (&directory, FALSE)); + if (!do_service_reload_test (&directory, FALSE)) + ; /* Do nothing? */ /* Do OOM tests */ if (!init_service_reload_test (&directory)) _dbus_assert_not_reached ("could not initiate service reload test"); - if (!do_service_reload_test (&directory, TRUE)); + if (!do_service_reload_test (&directory, TRUE)) + ; /* Do nothing? */ /* Cleanup test directory */ if (!cleanup_service_reload_test (&directory)) |