Revision 574b2324 conf/conf.c

View differences:

conf/conf.c
384 384
  if (config_timer->expires == 0)
385 385
    return CONF_NOTHING;
386 386

  
387
  tm_stop(config_timer);
387
  tm2_stop(config_timer);
388 388

  
389 389
  return CONF_CONFIRM;
390 390
}
......
420 420
    return CONF_NOTHING;
421 421

  
422 422
  undo_available = 0;
423
  tm_stop(config_timer);
423
  tm2_stop(config_timer);
424 424

  
425 425
  if (configuring)
426 426
    {
......
468 468
  config_event = ev_new(&root_pool);
469 469
  config_event->hook = config_done;
470 470

  
471
  config_timer = tm_new(&root_pool);
471
  config_timer = tm2_new(&root_pool);
472 472
  config_timer->hook = config_timeout;
473 473
}
474 474

  

Also available in: Unified diff