diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-11-15 13:33:27 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-11-15 13:33:27 +0000 |
| commit | dfa62b24adde8666df4d9cf64569d3aa51063ac8 (patch) | |
| tree | 317f570ba08c5b1c76dd66a34aec54f69abcff64 | |
| parent | 9c26d255d7d94a6a9be961672ca666de601b561d (diff) | |
| download | dbus-python-dfa62b24adde8666df4d9cf64569d3aa51063ac8.tar.gz | |
Bump dbus dependency to 1.4 so we can make decent error handling mandatory
| -rw-r--r-- | _dbus_bindings/message-append.c | 4 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 1 insertions, 15 deletions
diff --git a/_dbus_bindings/message-append.c b/_dbus_bindings/message-append.c index 772966e..c2c4616 100644 --- a/_dbus_bindings/message-append.c +++ b/_dbus_bindings/message-append.c @@ -529,14 +529,10 @@ dbuspy_message_iter_close_container(DBusMessageIter *iter, DBusMessageIter *sub, dbus_bool_t is_ok) { -#ifdef HAVE_DBUS_MESSAGE_ITER_ABANDON_CONTAINER if (!is_ok) { dbus_message_iter_abandon_container(iter, sub); return TRUE; } -#else - (void) is_ok; -#endif return dbus_message_iter_close_container(iter, sub); } diff --git a/configure.ac b/configure.ac index 6a38208..b096502 100644 --- a/configure.ac +++ b/configure.ac @@ -148,19 +148,9 @@ AC_SUBST([RST2HTMLFLAGS]) AM_CONDITIONAL([ENABLE_API_DOCS], [test "$enable_api_docs" != no]) AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_html_docs" != no]) -PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0]) +PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.4]) PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.70]) -dnl avoid deprecated stuff if possible -AC_CHECK_LIB([dbus-1], [dbus_watch_get_unix_fd], - [AC_DEFINE([HAVE_DBUS_WATCH_GET_UNIX_FD], [], - [Define if libdbus-1 has dbus_watch_get_unix_fd])], - [:], [$DBUS_LIBS]) -AC_CHECK_LIB([dbus-1], [dbus_message_iter_abandon_container], - [AC_DEFINE([HAVE_DBUS_MESSAGE_ITER_ABANDON_CONTAINER], [], - [Define if libdbus-1 has dbus_message_iter_abandon_container])], - [:], [$DBUS_LIBS]) - TP_COMPILER_WARNINGS([CFLAGS_WARNINGS], [test] dbus_python_released [= 0], [all \ extra \ |