On Sun, Apr 03, 2016 at 05:39:49PM -0400, Michael Greger wrote:
> Here's a patch to remove the obsolensence checking that xscreensaver does.
For an upload to stable-proposed-updates, the release managers
appreciate that diffs are as small and easy to understand as possible,
so the shorter the diff, the better.
I would apply one of the following patches.
(The not-so-short version does not even modify the senescent_p()
function)
Thanks.
--- a/driver/demo-Gtk.c
+++ b/driver/demo-Gtk.c
@@ -5292,7 +5292,7 @@ main (int argc, char **argv)
the_network_is_not_the_computer (s);
- if (senescent_p())
+ if (0)
warning_dialog (s->toplevel_widget,
_("Warning:\n\n"
"This version of xscreensaver is VERY OLD!\n"
--- a/driver/lock.c
+++ b/driver/lock.c
@@ -487,7 +487,7 @@ make_passwd_window (saver_info *si,
* room for the dialog to grow without going off the edge of the screen. */
max_string_width_px *= 0.75;
- if (!info_msg && senescent_p())
+ if (!info_msg)
info_msg = ("\n"
"This version of XScreenSaver\n"
"is very old! Please upgrade!\n");
--- a/driver/splash.c
+++ b/driver/splash.c
@@ -167,7 +167,7 @@ make_splash_dialog (saver_info *si)
Colormap cmap;
char *f;
- Bool whine = senescent_p ();
+ Bool whine = 0;
if (whine)
{
--- a/driver/xscreensaver.c
+++ b/driver/xscreensaver.c
@@ -784,7 +784,7 @@ print_banner (saver_info *si)
"\n",
blurb());
- if (p->verbose_p && senescent_p ())
+ if (p->verbose_p)
fprintf (stderr, "\n"
"*************************************"
"**************************************\n"
--- a/driver/prefs.c
+++ b/driver/prefs.c
@@ -1736,5 +1736,5 @@ senescent_p (void)
months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - /* h */
(y * 12 + m)); /* h */
/* h */
- return (months > 18); /* p
*/
+ return (0); /* p */
}
