diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-06-18 16:24:03 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-06-18 16:24:03 +0000 |
| commit | 98f19852078cf03f8b50a93d49d83b85c0dd400b (patch) | |
| tree | 908d078ac605cd6f27c2d1e104c9589b31dce01a /dbus/dbus-connection.h | |
| parent | fb93e1faa875d6b1ca48b0e792a9b79aa7cbc517 (diff) | |
2007-06-18 Havoc Pennington <hp@redhat.com>
* 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
Diffstat (limited to 'dbus/dbus-connection.h')
| -rw-r--r-- | dbus/dbus-connection.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h index 533ac98d..ec227604 100644 --- a/dbus/dbus-connection.h +++ b/dbus/dbus-connection.h @@ -352,7 +352,12 @@ dbus_bool_t dbus_connection_get_socket (DBusConnection * @{ */ -int dbus_watch_get_fd (DBusWatch *watch); +#ifndef DBUS_DISABLE_DEPRECATED +DBUS_DEPRECATED int dbus_watch_get_fd (DBusWatch *watch); +#endif + +int dbus_watch_get_unix_fd (DBusWatch *watch); +int dbus_watch_get_socket (DBusWatch *watch); unsigned int dbus_watch_get_flags (DBusWatch *watch); void* dbus_watch_get_data (DBusWatch *watch); void dbus_watch_set_data (DBusWatch *watch, |