X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxlockmore.c;h=58d6acd9b3c2379ff338a431c8b5e743519e53e5;hb=de460e831dc8578acfa8b72251ab9346c99c1f96;hp=2fadd7946f0de3eaded5cdc1186cff62d583b2df;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/xlockmore.c b/hacks/xlockmore.c
index 2fadd794..58d6acd9 100644
--- a/hacks/xlockmore.c
+++ b/hacks/xlockmore.c
@@ -1,6 +1,5 @@
 /* xlockmore.c --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997, 1998, 2001, 2002, 2004, 2006
- *  Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1997-2008 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
@@ -441,7 +440,7 @@ xlockmore_init (Display *dpy, Window window,
   mi->size	 = get_integer_resource (dpy, "size", "Int");
 
   mi->threed = get_boolean_resource (dpy, "use3d", "Boolean");
-  mi->threed_delta = get_float_resource (dpy, "delta3d", "Boolean");
+  mi->threed_delta = get_float_resource (dpy, "delta3d", "Float");
   mi->threed_right_color = get_pixel_resource (dpy,
 					       mi->xgwa.colormap, "right3d", "Color");
   mi->threed_left_color = get_pixel_resource (dpy,
@@ -521,7 +520,7 @@ xlockmore_reshape (Display *dpy, Window window, void *closure,
                  unsigned int w, unsigned int h)
 {
   ModeInfo *mi = (ModeInfo *) closure;
-  if (mi->xlmft->hack_reshape)
+  if (mi && mi->xlmft->hack_reshape)
     {
       XGetWindowAttributes (dpy, window, &mi->xgwa);
       mi->xlmft->hack_reshape (mi, mi->xgwa.width, mi->xgwa.height);
@@ -532,7 +531,7 @@ static Bool
 xlockmore_event (Display *dpy, Window window, void *closure, XEvent *event)
 {
   ModeInfo *mi = (ModeInfo *) closure;
-  if (mi->xlmft->hack_handle_events)
+  if (mi && mi->xlmft->hack_handle_events)
     {
       mi->xlmft->hack_handle_events (mi, event);
       /* Since xlockmore hacks don't tell us whether they handled the