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 /dbus | |
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 'dbus')
-rw-r--r-- | dbus/Makefile.am | 2 | ||||
-rw-r--r-- | dbus/dbus-keyring.c | 2 | ||||
-rw-r--r-- | dbus/dbus-message-factory.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index f4175c79..b6b50d70 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -167,7 +167,7 @@ noinst_LTLIBRARIES=libdbus-convenience.la libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) ## don't export symbols that start with "_" (we use this ## convention for internal symbols) -libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined ## note that TESTS has special meaning (stuff to use in make check) ## so if adding tests not to be run in make check, don't add them to diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index 11f4826c..ede14d9d 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -571,7 +571,7 @@ _dbus_keyring_reload (DBusKeyring *keyring, if (!add_new_key (&keys, &n_keys, error)) { _dbus_verbose ("Failed to generate new key: %s\n", - error ? "(unknown)" : error->message); + error ? error->message : "(unknown)"); goto out; } diff --git a/dbus/dbus-message-factory.c b/dbus/dbus-message-factory.c index 984b69d9..6b194226 100644 --- a/dbus/dbus-message-factory.c +++ b/dbus/dbus-message-factory.c @@ -383,7 +383,7 @@ generate_special (DBusMessageDataIter *iter, _dbus_assert_not_reached ("oom"); i = 0; - while (i <= (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH + 1)) + while (i < (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH + 1)) { long_sig[i] = DBUS_TYPE_ARRAY; ++i; @@ -428,7 +428,7 @@ generate_special (DBusMessageDataIter *iter, long_sig[i] = DBUS_TYPE_INT32; ++i; - while (i <= (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH*2 + 3)) + while (i < (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH*2 + 3)) { long_sig[i] = DBUS_STRUCT_END_CHAR; ++i; |