diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-10-04 14:01:06 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-10-04 14:01:06 +0000 |
| commit | ce397ae3d37d13e8665c93515f7f841f41dc32ea (patch) | |
| tree | 70b8fa12756680e2f7b7284e737f0225cb558cd8 | |
| parent | 75e9f40bc7fa230182ea23fbd26064f2ab25d87c (diff) | |
Handle deprecated dbus_watch_get_fd() function
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | common/dbus.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8eb0effc..320f8946 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -95,6 +95,8 @@ AC_DEFUN([AC_PATH_DBUS], [ ]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) + AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes, + AC_DEFINE(NEED_DBUS_WATCH_GET_UNIX_FD, 1, [Define to 1 if you need the dbus_watch_get_unix_fd() function.])) ]) AC_DEFUN([AC_PATH_OPENOBEX], [ diff --git a/common/dbus.c b/common/dbus.c index 1b5f7db8..61307bc0 100644 --- a/common/dbus.c +++ b/common/dbus.c @@ -37,6 +37,10 @@ #include <dbus/dbus.h> +#ifdef NEED_DBUS_WATCH_GET_UNIX_FD +#define dbus_watch_get_unix_fd dbus_watch_get_fd +#endif + #ifdef HAVE_DBUS_GLIB #include <dbus/dbus-glib-lowlevel.h> #endif @@ -457,7 +461,7 @@ static dbus_bool_t add_server(DBusWatch *watch, void *data) info = g_new(struct server_info, 1); - fd = dbus_watch_get_fd(watch); + fd = dbus_watch_get_unix_fd(watch); info->io = g_io_channel_unix_new(fd); info->server = dbus_server_ref(server); @@ -542,7 +546,7 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) info = g_new(struct watch_info, 1); - fd = dbus_watch_get_fd(watch); + fd = dbus_watch_get_unix_fd(watch); info->io = g_io_channel_unix_new(fd); info->conn = dbus_connection_ref(conn); |