X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fdemo-Xm.c;h=b1b08f867326077fb918d994be2af41dd7ddf2dd;hb=4cecfc89e5e889c7232693897c06168fb378bd5c;hp=198f9bd8be60c7d4de5cae4140b79ba490bdee18;hpb=585e1a6717d1dd9b90fbb53acaaae82106354d33;p=xscreensaver

diff --git a/driver/demo-Xm.c b/driver/demo-Xm.c
index 198f9bd8..b1b08f86 100644
--- a/driver/demo-Xm.c
+++ b/driver/demo-Xm.c
@@ -72,6 +72,9 @@
 # ifndef XmNtextField		/* Lesstif 0.89.4 bug */
 #  undef HAVE_XMCOMBOBOX
 # endif
+# if (XmVersion < 2001)		/* Lesstif has two personalities these days */
+#  undef HAVE_XMCOMBOBOX
+# endif
 #endif /* HAVE_XMCOMBOBOX */
 
 #include "version.h"
@@ -351,8 +354,13 @@ about_menu_cb (Widget button, XtPointer client_data, XtPointer ignored)
   *s2 = 0;
   s2 += 2;
 
-  sprintf (buf, "%s\n%s\n\n"
-           "For updates, check http://www.jwz.org/xscreensaver/",
+  sprintf (buf, "%s\n%s\n"
+           "\n"
+           "This is the Motif version of \"xscreensaver-demo\".  The Motif\n"
+           "version is no longer maintained.  Please use the GTK version\n"
+           "instead, which has many more features.\n"
+           "\n"
+           "For xscreensaver updates, check http://www.jwz.org/xscreensaver/",
            s, s2);
   free (s);
 
@@ -1263,6 +1271,7 @@ get_hack_blurb (screenhack *hack)
     }
   else
     {
+# if 0
       static int doc_installed = 0;
       if (doc_installed == 0)
         {
@@ -1283,7 +1292,16 @@ get_hack_blurb (screenhack *hack)
                   "To fix this problem, delete that file, or "
                   "install a current version (either will work.)");
       else
-        doc_string = strdup ("");
+# endif /* 0 */
+        doc_string = strdup (
+           "\n"
+           "This is the Motif version of \"xscreensaver-demo\".  The Motif "
+           "version is no longer maintained.  Please use the GTK version "
+           "instead, which has many more features."
+           "\n\n"
+           "If you were running the GTK version, there would be a preview "
+           "of this screen saver mode displayed here, along with graphical "
+           "configuration options.");
     }
 
   return doc_string;
@@ -1652,10 +1670,8 @@ static int
 demo_ehandler (Display *dpy, XErrorEvent *error)
 {
   fprintf (stderr, "\nX error in %s:\n", progname);
-  if (XmuPrintDefaultErrorMessage (dpy, error, stderr))
-    exit (-1);
-  else
-    fprintf (stderr, " (nonfatal.)\n");
+  XmuPrintDefaultErrorMessage (dpy, error, stderr);
+  exit (-1);
   return 0;
 }