X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fblocktube.c;h=7219a9ab5a18b2fa83c68093bbf11687d4b746ad;hb=447db08c956099b3b183886729108bf5b364c4b8;hp=9202c551c830f740acf427133f89eef88d0664e1;hpb=ffd8c0873576a9e3065696a624dce6b766b77062;p=xscreensaver

diff --git a/hacks/glx/blocktube.c b/hacks/glx/blocktube.c
index 9202c551..7219a9ab 100644
--- a/hacks/glx/blocktube.c
+++ b/hacks/glx/blocktube.c
@@ -31,11 +31,7 @@ extern XtAppContext app;
 #define DEF_FOG         "True"
 
 #define DEFAULTS        "*delay:	40000           \n" \
-                        "*holdtime:   " DEF_HOLDTIME   "\n" \
-                        "*changetime: " DEF_CHANGETIME "\n" \
-			"*wireframe:    False           \n" \
-			"*texture:    " DEF_TEXTURE    "\n" \
-			"*fog:        " DEF_FOG        "\n" \
+                        "*wireframe:    False           \n" \
 			"*showFPS:      False           \n" \
 
 #undef countof
@@ -50,7 +46,7 @@ extern XtAppContext app;
 
 #include <GL/glu.h>
 
-#if defined( USE_XPM ) || defined( USE_XPMINC ) || defined( HAVE_XPM )
+#if defined(USE_XPM) || defined(USE_XPMINC) || defined(HAVE_XPM) || defined (HAVE_GDK_PIXBUF)
 /* USE_XPM & USE_XPMINC in xlock mode ; HAVE_XPM in xscreensaver mode */
 #include "xpm-ximage.h"
 #define I_HAVE_XPM