diff options
| author | Havoc Pennington <hp@redhat.com> | 2006-10-21 23:38:11 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2006-10-21 23:38:11 +0000 |
| commit | 24083e8f076c7d437245864719d109f296f7ca9c (patch) | |
| tree | bc0c431a922f6b912f3fab4a0d4dfb13783da0fb | |
| parent | bf172ce4c5856af21f5ee208960bf718a5058ad9 (diff) | |
2006-10-21 Havoc Pennington <hp@redhat.com>
* dbus/dbus-connection.h: don't include the watch/timeout
functions in connection section
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dbus/dbus-connection.h | 51 |
2 files changed, 38 insertions, 18 deletions
@@ -1,5 +1,10 @@ 2006-10-21 Havoc Pennington <hp@redhat.com> + * dbus/dbus-connection.h: don't include the watch/timeout + functions in connection section + +2006-10-21 Havoc Pennington <hp@redhat.com> + * Documentation! Whee! Doxygen now 100% silent. If you make it angry again, you will be punished. diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h index 7d775a2f..02d433d2 100644 --- a/dbus/dbus-connection.h +++ b/dbus/dbus-connection.h @@ -223,24 +223,6 @@ void dbus_connection_set_route_peer_messages (DBusConnection dbus_bool_t value); -int dbus_watch_get_fd (DBusWatch *watch); -unsigned int dbus_watch_get_flags (DBusWatch *watch); -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); -void* dbus_timeout_get_data (DBusTimeout *timeout); -void dbus_timeout_set_data (DBusTimeout *timeout, - void *data, - DBusFreeFunction free_data_function); -dbus_bool_t dbus_timeout_handle (DBusTimeout *timeout); -dbus_bool_t dbus_timeout_get_enabled (DBusTimeout *timeout); - /* Filters */ dbus_bool_t dbus_connection_add_filter (DBusConnection *connection, @@ -343,6 +325,39 @@ char* dbus_get_local_machine_id (void); /** @} */ + +/** + * @addtogroup DBusWatch + * @{ + */ + +int dbus_watch_get_fd (DBusWatch *watch); +unsigned int dbus_watch_get_flags (DBusWatch *watch); +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); + +/** @} */ + +/** + * @addtogroup DBusTimeout + * @{ + */ + +int dbus_timeout_get_interval (DBusTimeout *timeout); +void* dbus_timeout_get_data (DBusTimeout *timeout); +void dbus_timeout_set_data (DBusTimeout *timeout, + void *data, + DBusFreeFunction free_data_function); +dbus_bool_t dbus_timeout_handle (DBusTimeout *timeout); +dbus_bool_t dbus_timeout_get_enabled (DBusTimeout *timeout); + +/** @} */ + DBUS_END_DECLS #endif /* DBUS_CONNECTION_H */ |