dbus/dbus dbus-connection.h,1.47,1.48

[Havoc Pennington]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv27971/dbus

Modified Files:
	dbus-connection.h 
Log Message:
2006-10-21  Havoc Pennington  <hp at redhat.com>

	* dbus/dbus-connection.h: don't include the watch/timeout
	functions in connection section



Index: dbus-connection.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- dbus-connection.h	21 Oct 2006 21:57:31 -0000	1.47
+++ dbus-connection.h	21 Oct 2006 23:38:11 -0000	1.48
@@ -223,24 +223,6 @@
                                                                  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 @@
 
 /** @} */
 
+
+/**
+ * @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 */