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

diff --git a/driver/demo-Xm.c b/driver/demo-Xm.c
index 198f9bd8..cd7f7987 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"
@@ -1652,10 +1655,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;
 }