diff options
author | Havoc Pennington <hp@redhat.com> | 2003-04-08 04:46:05 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-04-08 04:46:05 +0000 |
commit | a162febe6746269f51b3a16db5f6fb240001f828 (patch) | |
tree | 1ea8de21fbf7f91636499f6d08207d7a02db60fb /dbus | |
parent | fe22b2194d53061fefe64d48ff6a53e6a762279d (diff) |
2003-04-07 Havoc Pennington <hp@pobox.com>
* bus/driver.c (bus_driver_handle_acquire_service): return an
error if you try to acquire a service that starts with ':'
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/dbus-mainloop.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c index 635bd58e..b1706fe7 100644 --- a/dbus/dbus-mainloop.c +++ b/dbus/dbus-mainloop.c @@ -373,13 +373,16 @@ check_timeout (unsigned long tv_sec, if (sec > interval_seconds || (sec == interval_seconds && msec > interval_milliseconds)) { - /* The system time has been set backwards, reset the timeout */ + _dbus_verbose ("System clock went backward interval_seconds %ld interval_msecs %ld sec %ld msec %ld last_tv_sec %lu last_tv_usec %lu tv_sec %lu tv_usec %lu\n", + interval_seconds, interval_milliseconds, sec, msec, tcb->last_tv_sec, + tcb->last_tv_usec, tv_sec, tv_usec); + + /* The system time has been set backwards, reset the timeout */ + tcb->last_tv_sec = tv_sec; tcb->last_tv_usec = tv_usec; msec = MIN (_DBUS_INT_MAX, interval); - - _dbus_verbose ("System clock went backward\n"); } else { |