* 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 <scott@ubuntu.com>
tv_sec, tv_usec);
if (((item->added_tv_sec == 0) && (item->added_tv_usec == 0)) ||
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);
{
_dbus_verbose ("Expiring an item %p\n", item);
+ else if (list->expire_after > 0)