~ubuntu-branches/ubuntu/natty/xscreensaver/natty

« back to all changes in this revision

Viewing changes to driver/timers.c

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2006-01-17 02:20:00 UTC
  • Revision ID: james.westby@ubuntu.com-20060117022000-pj81460h9lo8anky
Tags: 4.23-4ubuntu1
merge with debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
331
331
  if (si->cycle_id) abort ();   /* no cycle timer when inactive */
332
332
 
333
333
  si->last_activity_time = time ((time_t *) 0);
334
 
 
335
 
  /* This will (hopefully, supposedly) tell the server to re-set its
336
 
     DPMS timer.  Without this, the -deactivate clientmessage would
337
 
     prevent xscreensaver from blanking, but would not prevent the
338
 
     monitor from powering down. */
339
 
  XForceScreenSaver (si->dpy, ScreenSaverReset);
340
 
 
341
 
  /* And if the monitor is already powered off, turn it on.
342
 
     You'd think the above would do that, but apparently not? */
343
 
  monitor_power_on (si);
344
334
}
345
335
 
346
336