Index: dbus/dbus-watch.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-watch.c,v
retrieving revision 1.22
diff -u -r1.22 dbus-watch.c
--- dbus/dbus-watch.c	21 Oct 2006 21:57:31 -0000	1.22
+++ dbus/dbus-watch.c	17 Jun 2007 12:25:05 -0000
@@ -33,23 +33,7 @@
  * @{
  */
 
-/**
- * Implementation of DBusWatch
- */
-struct DBusWatch
-{
-  int refcount;                        /**< Reference count */
-  int fd;                              /**< File descriptor. */
-  unsigned int flags;                  /**< Conditions to watch. */
-
-  DBusWatchHandler handler;                    /**< Watch handler. */
-  void *handler_data;                          /**< Watch handler data. */
-  DBusFreeFunction free_handler_data_function; /**< Free the watch handler data. */
-  
-  void *data;                          /**< Application data. */
-  DBusFreeFunction free_data_function; /**< Free the application data. */
-  unsigned int enabled : 1;            /**< Whether it's enabled. */
-};
+#include "dbus-watch-private.h"
 
 /**
  * Creates a new DBusWatch. Used to add a file descriptor to be polled
@@ -481,6 +465,7 @@
  */
 
 /**
+ * @fn int dbus_watch_get_fd (DBusWatch *watch)
  * Gets the file descriptor that should be watched.
  *
  * On Windows, this will be a socket. On UNIX right now it will be a
@@ -488,12 +473,30 @@
  * 
  * @param watch the DBusWatch object.
  * @returns the file descriptor to watch.
+ * @deprecated use dbus_watch_get_unix_fd() or dbus_watch_get_socket()
+ */
+
+/**
+ * @fn int dbus_watch_get_unix_fd (DBusWatch *watch)
+ * Gets the unix file descriptor that should be watched.
+ *
+ * This functions gives only usefull results on UNIX.
+ * On Windows this function will return -1.
+ * 
+ * @param watch the DBusWatch object.
+ * @returns the unix file descriptor to watch.
+ */
+
+/**
+ * @fn int dbus_watch_get_socket (DBusWatch *watch)
+ * Gets the descriptor that should be watched.
+ *
+ * On Windows, this will be a socket. 
+ * On UNIX right now it will be a socket too.
+ * 
+ * @param watch the DBusWatch object.
+ * @returns the file descriptor to watch.
  */
-int
-dbus_watch_get_fd (DBusWatch *watch)
-{
-  return watch->fd;
-}
 
 /**
  * Gets flags from DBusWatchFlags indicating
