* dbus/dbus-watch.c (dbus_watch_get_fd): this function is deprecated and its behavior...

diff --git a/ChangeLog b/ChangeLog
index fa56076026f6182c700d1d19e06b3c63b8df3d14..5780b67a160d8ba267351f2f267b26404753287d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-21  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       * dbus/dbus-watch.c (dbus_watch_get_fd): this function is 
+       deprecated and its behavior should be as before until all 
+       client code is migrated. 
+
 2007-06-19  Ralf Habacker  <ralf.habacker@freenet.de>
 
        * dbus/dbus-sysdeps-util-win.c, tools/dbus-launch-win.c: 

diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
index 7ec0661cb268b83ebb8a64dedb241f1eb2f7f065..634ab247676b44d65317c3e2cb35a16c363e17cc 100644 (file)
--- a/dbus/dbus-watch.c
+++ b/dbus/dbus-watch.c
@@ -489,7 +489,11 @@ _dbus_watch_set_handler (DBusWatch        *watch,
 int
 dbus_watch_get_fd (DBusWatch *watch)
 {
-  return dbus_watch_get_unix_fd (watch);
+#ifdef DBUS_WIN_FIXME
+  return watch->fd;
+#else
+  return dbus_watch_get_unix_fd(watch);
+#endif
 }
 
 /**