diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-01-18 17:40:42 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-01-18 17:40:42 +0000 |
| commit | 0363701c341796278041fb9ea7de80eaaf41479a (patch) | |
| tree | 005dc8da9378917aad6cf57636b2c2558ec108bb /dbus/dbus-connection.h | |
| parent | 6ac750b03fb32591769d0a6ece8840932622fead (diff) | |
2003-01-18 Havoc Pennington <hp@pobox.com>
* dbus/dbus-connection.c (dbus_connection_unref): disconnect the
connection if it hasn't been already.
* dbus/dbus-connection.h: kill off the idea of an ErrorFunction,
replace with DisconnectFunction.
Diffstat (limited to 'dbus/dbus-connection.h')
| -rw-r--r-- | dbus/dbus-connection.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h index c7692905..d0211b42 100644 --- a/dbus/dbus-connection.h +++ b/dbus/dbus-connection.h @@ -40,7 +40,7 @@ typedef struct DBusMessageHandler DBusMessageHandler; typedef enum { DBUS_HANDLER_RESULT_REMOVE_MESSAGE, /**< Remove this message, no further processing. */ - DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS /**< Run any additional handlers that are interested on this message. */ + DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS /**< Run any additional handlers that are interested in this message. */ } DBusHandlerResult; typedef enum @@ -60,9 +60,8 @@ typedef void (* DBusAddWatchFunction) (DBusWatch *watch, typedef void (* DBusRemoveWatchFunction) (DBusWatch *watch, void *data); -typedef void (* DBusConnectionErrorFunction) (DBusConnection *connection, - DBusResultCode error_code, - void *data); +typedef void (* DBusDisconnectFunction) (DBusConnection *connection, + void *data); DBusConnection* dbus_connection_open (const char *address, DBusResultCode *result); @@ -86,18 +85,19 @@ dbus_bool_t dbus_connection_send_message_with_reply (DBusConnection *connect int timeout_milliseconds, DBusResultCode *result); -void dbus_connection_set_error_function (DBusConnection *connection, - DBusConnectionErrorFunction error_function, - void *data, - DBusFreeFunction free_data_function); -void dbus_connection_set_watch_functions (DBusConnection *connection, - DBusAddWatchFunction add_function, - DBusRemoveWatchFunction remove_function, - void *data, - DBusFreeFunction free_data_function); -void dbus_connection_handle_watch (DBusConnection *connection, - DBusWatch *watch, - unsigned int condition); +void dbus_connection_set_disconnect_function (DBusConnection *connection, + DBusDisconnectFunction function, + void *data, + DBusFreeFunction free_data_function); +void dbus_connection_set_watch_functions (DBusConnection *connection, + DBusAddWatchFunction add_function, + DBusRemoveWatchFunction remove_function, + void *data, + DBusFreeFunction free_data_function); +void dbus_connection_handle_watch (DBusConnection *connection, + DBusWatch *watch, + unsigned int condition); + int dbus_watch_get_fd (DBusWatch *watch); unsigned int dbus_watch_get_flags (DBusWatch *watch); |