blob: e199c6def68ebc483da153ccf22c6a2a062ac519 [file] [log] [blame]
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -31,21 +31,21 @@
*mode: random
*timeout: 0:10:00
*cycle: 0:10:00
-*lockTimeout: 0:00:00
+*lockTimeout: 0:30:00
*passwdTimeout: 0:00:30
-*dpmsEnabled: False
+*dpmsEnabled: True
*dpmsQuickoffEnabled: False
*dpmsStandby: 2:00:00
*dpmsSuspend: 2:00:00
*dpmsOff: 4:00:00
-*grabDesktopImages: True
+*grabDesktopImages: False
*grabVideoFrames: False
*chooseRandomImages: @DEFAULT_IMAGES_P@
! This can be a local directory name, or the URL of an RSS or Atom feed.
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
*nice: 10
*memoryLimit: 0
-*lock: False
+*lock: True
*verbose: False
*timestamp: True
*fade: True
@@ -63,7 +63,7 @@
*textLiteral: XScreenSaver
*textFile: @DEFAULT_TEXT_FILE@
*textProgram: fortune
-*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
+*textURL: https://planet.gentoo.org/rss20.xml
*overlayTextForeground: #FFFF00
*overlayTextBackground: #000000
@@ -123,7 +123,8 @@
! The format used for printing the date and time in the password dialog box
! (see the strftime(3) manual page for details.)
-*dateFormat: %d-%b-%y (%a); %I:%M %p
+!*dateFormat: %d-%b-%y (%a); %I:%M %p
+*dateFormat: %x %X
! To show the time only:
! *dateFormat: %I:%M %p
! For 24 hour time:
--- a/hacks/barcode.c
+++ a/hacks/barcode.c
@@ -131,7 +131,6 @@
"children",
"chocolate",
"CLONE",
- "cock",
"constriction",
"contrition",
"cop",
@@ -265,7 +264,6 @@
"punishment",
"punk rock",
"punk",
- "pussy",
"quagmire",
"quarantine",
"quartz",
@@ -333,8 +331,6 @@
"vegetarian",
"venom",
"verifiability",
- "viagra",
- "vibrator",
"victim",
"vignette",
"villainy",
--- a/hacks/glx/glsnake.c
+++ a/hacks/glx/glsnake.c
@@ -565,17 +565,17 @@
ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
ZERO, PIN, ZERO }
},
- { "erect penis", /* thanks benno */
+ { "shuffle board", /* thanks benno */
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
ZERO, ZERO }
},
- { "flaccid penis",
+ { "flaccid anchor",
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
ZERO, ZERO }
},
- { "vagina",
+ { "engagement ring",
{ RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
PIN, RIGHT, ZERO }
@@ -995,7 +995,7 @@
{ "Parrot",
{ ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
},
- { "Penis",
+ { "Shuttle",
{ PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
},
{ "PictureComingSoon",