summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--dbus/dbus-watch.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa560760..5780b67a 100644
--- 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 7ec0661c..634ab247 100644
--- 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
}
/**