← Back to branch summary

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

« back to all changes in this revision

Viewing changes to driver/prefs.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:
driver/prefs.c
1
1
/* dotfile.c --- management of the ~/.xscreensaver file.
2
 
 * xscreensaver, Copyright (c) 1998-2006 Jamie Zawinski <jwz@jwz.org>
 
2
 * xscreensaver, Copyright (c) 1998-2008 Jamie Zawinski <jwz@jwz.org>
3
3
 *
4
4
 * Permission to use, copy, modify, distribute, and sell this software and its
5
5
 * documentation for any purpose is hereby granted without fee, provided that
272
272
  "fadeTicks",
273
273
  "captureStderr",
274
274
  "captureStdout",              /* not saved -- obsolete */
 
275
  "logFile",                    /* not saved */
275
276
  "ignoreUninstalledPrograms",
276
277
  "font",
277
278
  "dpmsEnabled",
808
809
      CHECK("fadeTicks")        type = pref_int,  i = p->fade_ticks;
809
810
      CHECK("captureStderr")    type = pref_bool, b = p->capture_stderr_p;
810
811
      CHECK("captureStdout")    continue;  /* don't save */
 
812
      CHECK("logFile")          continue;  /* don't save */
811
813
      CHECK("ignoreUninstalledPrograms")
812
814
                                type = pref_bool, b = p->ignore_uninstalled_p;
813
815