← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xscreensaver/quantal

« back to all changes in this revision

Viewing changes to hacks/mismunch.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-08-28 16:15:25 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080828161525-mxga521aoezxjq8h
Tags: 5.07-0ubuntu1
* Upgrade upstream version
* debian/control: Remove suggest xdaliclock as it is no longer
  included
* Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
  upstream.
* Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
  from the build files.  There is nothing in the Changelog about it
  so I believe it was accidental.
* Updating the .desktop files from the XML files using gnome-screensaver's
  utility to do so.  Lots of text updates.  Also:
    * Added: abstractile.desktop
    * Added: cwaves.desktop
    * Added: m6502.desktop
    * Added: skytentacles.desktop
    * Removed: xteevee.desktop
* xscreensaver-gl-extra.files: Added skytentacles
* xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
* xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/mismunch.c
291
291
mismunch_draw (Display *dpy, Window w, void *closure)
292
292
{
293
293
  struct state *st = (struct state *) closure;
 
294
  int i;
 
295
 
 
296
  for (i = 0; i < 5; i++) {
294
297
 
295
298
  /* for (draw_i = 0; draw_i < simul; draw_i++)  */
296
299
  {
320
323
    }
321
324
  }
322
325
 
 
326
  }
 
327
 
323
328
  return st->delay;
324
329
}
325
330
 
356
361
static const char *mismunch_defaults [] = {
357
362
  ".background:       black",
358
363
  ".foreground:       white",
359
 
  "*delay:            2500",
 
364
  "*fpsSolid:         true",
 
365
  "*delay:            10000",
360
366
  "*simul:            5",
361
367
  "*clear:            65",
362
368
  "*xor:              True",