dbus/bus activation.c,1.39,1.40
John Palmieri
johnp at freedesktop.org
Tue Sep 6 15:38:56 PDT 2005
Update of /cvs/dbus/dbus/bus
In directory gabe:/tmp/cvs-serv32375/bus
Modified Files:
activation.c
Log Message:
* Released 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)
Index: activation.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/activation.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- activation.c 14 Jul 2005 20:44:15 -0000 1.39
+++ activation.c 6 Sep 2005 22:38:54 -0000 1.40
@@ -1886,13 +1886,15 @@
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))
More information about the dbus-commit
mailing list