From ce326587c33d1d579785b6d8c18699964c1bc93a Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Mon, 11 May 2009 22:42:50 +0100 Subject: Expire list timeout may be negative for no expiry. * bus/expirelist.c (do_expiration_with_current_time): Don't check for expiry if expire_after is negative, will just disable the expiry timer after the call. Signed-off-by: Scott James Remnant (cherry picked from commit d672d0320628e93a247eeff89945c81926a42163) --- bus/expirelist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bus/expirelist.c b/bus/expirelist.c index 038cfee3..8cf1fad6 100644 --- a/bus/expirelist.c +++ b/bus/expirelist.c @@ -158,7 +158,7 @@ do_expiration_with_current_time (BusExpireList *list, tv_sec, tv_usec); if (((item->added_tv_sec == 0) && (item->added_tv_usec == 0)) || - (elapsed >= (double) list->expire_after)) + ((list->expire_after > 0) && (elapsed >= (double) list->expire_after))) { _dbus_verbose ("Expiring an item %p\n", item); @@ -174,7 +174,7 @@ do_expiration_with_current_time (BusExpireList *list, break; } } - else + else if (list->expire_after > 0) { double to_wait; -- cgit