http://www.jwz.org/xscreensaver/xscreensaver-5.13.tar.gz

[xscreensaver] / hacks / glx / glslideshow.c

diff --git a/hacks/glx/glslideshow.c b/hacks/glx/glslideshow.c
index 386b4d8ff8a0b9b84bb6e59c472ff3e8dffc0780..be77dc1fef0a66e6af3960e2ff55beadeb1d9adf 100644 (file)
--- a/hacks/glx/glslideshow.c
+++ b/hacks/glx/glslideshow.c
@@ -1,4 +1,4 @@
-/* glslideshow, Copyright (c) 2003-2008 Jamie Zawinski <jwz@jwz.org>
+/* glslideshow, Copyright (c) 2003-2011 Jamie Zawinski <jwz@jwz.org>
  * Loads a sequence of images and smoothly pans around them; crossfades
  * when loading new images.
  *
@@ -358,6 +358,9 @@ image_loaded_cb (const char *filename, XRectangle *geom,
       img->geom.height *= scale;
     }
 
+# if 0 /* xscreensaver-getimage returns paths relative to the image directory
+          now, so leave the sub-directory part in.
+        */
   if (img->title)  /* strip filename to part between last "/" and last ".". */
     {
       char *s = strrchr (img->title, '/');
@@ -365,6 +368,7 @@ image_loaded_cb (const char *filename, XRectangle *geom,
       s = strrchr (img->title, '.');
       if (s) *s = 0;
     }
+# endif /* 0 */
 
   if (debug_p)
     fprintf (stderr, "%s: loaded   img %2d: \"%s\"\n",