From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz

[xscreensaver] / driver / demo-Gtk.c

diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c
index c8a19cd391dfa01714b9b74939b510a825ae766d..0dfc387e88d468ed6246f909d8606f6e05a6f451 100644 (file)
--- a/driver/demo-Gtk.c
+++ b/driver/demo-Gtk.c
@@ -1,5 +1,5 @@
 /* demo-Gtk.c --- implements the interactive demo-mode and options dialogs.
- * xscreensaver, Copyright (c) 1993-2013 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1993-2018 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -123,11 +123,6 @@
 #include "logo-50.xpm"
 #include "logo-180.xpm"
 
-#undef dgettext  /* else these are defined twice... */
-#undef dcgettext
-
-#include "demo-Gtk-widgets.h"
-#include "demo-Gtk-support.h"
 #include "demo-Gtk-conf.h"
 
 #include <stdio.h>
@@ -806,7 +801,7 @@ about_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
   char *s, *s2;
   char copy[1024];
   char year[5];
-  char *desc = _("For updates, check http://www.jwz.org/xscreensaver/");
+  char *desc = _("For updates, check https://www.jwz.org/xscreensaver/");
 
   s = strchr (vers, ',');
   *s = 0;
@@ -1044,12 +1039,6 @@ await_xscreensaver (state *s)
                "\n"));
 
       if (root_p)
-
-# ifdef __GNUC__
-        __extension__     /* don't warn about "string length is greater than
-                             the length ISO C89 compilers are required to
-                             support" in the following expression... */
-# endif
         strcat (buf, STFU
          _("You are running as root.  This usually means that xscreensaver\n"
             "was unable to contact your X server because access control is\n"
@@ -1562,7 +1551,7 @@ flush_dialog_changes_and_save (state *s)
 
 # define TEXT(FIELD,NAME) \
     w = name_to_widget (s, (NAME)); \
-    (FIELD) = (char *) gtk_entry_get_text (GTK_ENTRY (w))
+    (FIELD) = (char *) g_strdup(gtk_entry_get_text (GTK_ENTRY (w)))
 
   MINUTES  (&p2->timeout,         "timeout_spinbutton");
   MINUTES  (&p2->cycle,           "cycle_spinbutton");
@@ -2925,7 +2914,6 @@ populate_prefs_page (state *s)
 
     /* DPMS
      */
-dpms_supported=1;
     SENSITIZE ("dpms_frame",              dpms_supported);
     SENSITIZE ("dpms_button",             dpms_supported);
     SENSITIZE ("dpms_quickoff_button",    dpms_supported);
@@ -4635,12 +4623,6 @@ g_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
 }
 
 
-#ifdef __GNUC__
- __extension__     /* shut up about "string length is greater than the length
-                      ISO C89 compilers are required to support" when including
-                      the .ad file... */
-#endif
-
 STFU
 static char *defaults[] = {
 #include "XScreenSaver_ad.h"
@@ -4721,7 +4703,7 @@ delayed_scroll_kludge (gpointer data)
 
 #ifdef HAVE_GTK2
 
-GtkWidget *
+static GtkWidget *
 create_xscreensaver_demo (void)
 {
   GtkWidget *nb;
@@ -4732,7 +4714,7 @@ create_xscreensaver_demo (void)
   return name_to_widget (global_state_kludge, "xscreensaver_demo");
 }
 
-GtkWidget *
+static GtkWidget *
 create_xscreensaver_settings_dialog (void)
 {
   GtkWidget *w, *box;
@@ -5297,13 +5279,13 @@ main (int argc, char **argv)
     the_network_is_not_the_computer (s);
 
 
-  if (senescent_p())
+  if (senesculent_p())
     warning_dialog (s->toplevel_widget,
       _("Warning:\n\n"
         "This version of xscreensaver is VERY OLD!\n"
         "Please upgrade!\n"
         "\n"
-        "http://www.jwz.org/xscreensaver/\n"
+        "https://www.jwz.org/xscreensaver/\n"
         "\n"
         "(If this is the latest version that your distro ships, then\n"
         "your distro is doing you a disservice. Build from source.)\n"