From 98f19852078cf03f8b50a93d49d83b85c0dd400b Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 18 Jun 2007 16:24:03 +0000 Subject: 2007-06-18 Havoc Pennington * dbus/dbus-watch.c (dbus_watch_get_socket) (dbus_watch_get_unix_fd): new API to match DBusConnection (dbus_watch_get_fd): deprecate this Throughout: just s/dbus_watch_get_fd/dbus_watch_get_socket/g for now since all the transports use sockets anyway --- dbus/dbus-mainloop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dbus/dbus-mainloop.c') diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c index 68284474..73d411e0 100644 --- a/dbus/dbus-mainloop.c +++ b/dbus/dbus-mainloop.c @@ -598,7 +598,7 @@ _dbus_loop_iterate (DBusLoop *loop, #if MAINLOOP_SPEW _dbus_verbose (" skipping watch on fd %d as it was out of memory last time\n", - dbus_watch_get_fd (wcb->watch)); + dbus_watch_get_socket (wcb->watch)); #endif } else if (dbus_watch_get_enabled (wcb->watch)) @@ -609,7 +609,7 @@ _dbus_loop_iterate (DBusLoop *loop, flags = dbus_watch_get_flags (wcb->watch); - fds[n_fds].fd = dbus_watch_get_fd (wcb->watch); + fds[n_fds].fd = dbus_watch_get_socket (wcb->watch); fds[n_fds].revents = 0; fds[n_fds].events = 0; if (flags & DBUS_WATCH_READABLE) @@ -628,7 +628,7 @@ _dbus_loop_iterate (DBusLoop *loop, { #if MAINLOOP_SPEW _dbus_verbose (" skipping disabled watch on fd %d %s\n", - dbus_watch_get_fd (wcb->watch), + dbus_watch_get_socket (wcb->watch), watch_flags_to_string (dbus_watch_get_flags (wcb->watch))); #endif } -- cgit