diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-06-21 08:29:24 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-06-21 08:29:24 +0000 |
| commit | b86ea8c1ec24efe29a32d2d85cde1a949d7c5563 (patch) | |
| tree | 9365cad77e3527fb92d19179359ca88d997cdaac | |
| parent | 3410f135ae3d50d2244f8c3acdb62925e9726ab5 (diff) | |
* 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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | dbus/dbus-watch.c | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -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 } /** |