Branch: Tag:

2009-11-26

2009-11-26 15:12:34 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Now uses Roxen.timeout_dequantifier() to calculate the timeouts.

Rev: server/modules/graphics/atlas.pike:1.20
Rev: server/modules/graphics/business.pike:1.155
Rev: server/modules/graphics/cimg.pike:1.84
Rev: server/modules/graphics/gbutton.pike:1.121
Rev: server/modules/graphics/graphic_text.pike:1.309
Rev: server/modules/graphics/gxml.pike:1.48

27:   // must also be aligned left or right.       - constant cvs_version = "$Id: gbutton.pike,v 1.120 2009/11/24 15:17:33 grubba Exp $"; + constant cvs_version = "$Id: gbutton.pike,v 1.121 2009/11/26 15:12:34 grubba Exp $";   constant thread_safe = 1;      #include <module.h>
853:    m_delete(args, "extra-mask-layers");    m_delete(args, "extra-frame-layers");    -  int timeout = UNDEFINED; -  if (args["unix-time"]) { -  timeout = (int)args["unix-time"] - time(1); -  } -  timeout = Roxen.time_dequantifier(args, timeout); -  if (!zero_type(timeout)) { -  // Clean up the args mapping. -  foreach(({ "unix-time", "seconds", "minutes", "beats", "hours", -  "days", "weeks", "months", "years" }), string arg) { -  m_delete(args, arg); -  } -  // Make sure the timeout is positive (and reasonable). -  if (timeout < 60) timeout = 60; -  } +  int timeout = Roxen.timeout_dequantifier(args);       if( fi ) {    new_args->stat = get_file_stat( fi, id );