diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-18 04:18:57 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-18 04:18:57 +0000 |
| commit | 3df260c07102745c5606c313af862558f105f83e (patch) | |
| tree | b0a9d23fc820a3bc61da1cd7e63fc810423a2210 /dbus/dbus-connection.h | |
| parent | 88cd5da3c0ec86fed29942b062c2f7bf0f8fda44 (diff) | |
2003-04-18 Havoc Pennington <hp@pobox.com>
* glib/dbus-gmain.c: adapt to watch changes
* bus/bus.c, bus/activation.c, etc.: adjust to watch changes
* dbus/dbus-server.h: remove dbus_server_handle_watch
* dbus/dbus-connection.h: remove dbus_connection_handle_watch
* dbus/dbus-watch.c (dbus_watch_handle): change DBusWatch to work
like DBusTimeout, so we don't need dbus_connection_handle_watch
etc.
Diffstat (limited to 'dbus/dbus-connection.h')
| -rw-r--r-- | dbus/dbus-connection.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h index 7e1de0cc..6e8a9f15 100644 --- a/dbus/dbus-connection.h +++ b/dbus/dbus-connection.h @@ -50,7 +50,7 @@ typedef enum DBUS_WATCH_READABLE = 1 << 0, /**< As in POLLIN */ DBUS_WATCH_WRITABLE = 1 << 1, /**< As in POLLOUT */ DBUS_WATCH_ERROR = 1 << 2, /**< As in POLLERR (can't watch for this, but - * the flag can be passed to dbus_connection_handle_watch()). + * the flag can be passed to dbus_watch_handle()). */ DBUS_WATCH_HANGUP = 1 << 3 /**< As in POLLHUP (can't watch for it, but * can be present in current state). */ @@ -130,9 +130,6 @@ void dbus_connection_set_dispatch_status_function (DBusConnection DBusDispatchStatusFunction function, void *data, DBusFreeFunction free_data_function); -dbus_bool_t dbus_connection_handle_watch (DBusConnection *connection, - DBusWatch *watch, - unsigned int condition); dbus_bool_t dbus_connection_get_unix_user (DBusConnection *connection, unsigned long *uid); void dbus_connection_set_unix_user_function (DBusConnection *connection, @@ -147,6 +144,8 @@ void* dbus_watch_get_data (DBusWatch *watch); void dbus_watch_set_data (DBusWatch *watch, void *data, DBusFreeFunction free_data_function); +dbus_bool_t dbus_watch_handle (DBusWatch *watch, + unsigned int flags); dbus_bool_t dbus_watch_get_enabled (DBusWatch *watch); int dbus_timeout_get_interval (DBusTimeout *timeout); |