X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fbubbles.h;h=24872e37ebf0372e813a90755ac16f939419f778;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=11ce3e6279fbc31f6a648cf1364c2a2e4080d35e;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/bubbles.h b/hacks/bubbles.h
index 11ce3e62..24872e37 100644
--- a/hacks/bubbles.h
+++ b/hacks/bubbles.h
@@ -5,9 +5,8 @@
 #ifndef _BUBBLES_H_
 #define _BUBBLES_H_
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
 # include "jwxyz.h"
-# define HAVE_XPM
 #else
 # include <X11/Xlib.h>
 #endif
@@ -190,7 +189,6 @@ typedef struct bub Bubble;
  * better name...)
  */
 
-#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM)
 struct bub_step {
   int radius;
   long area;
@@ -201,24 +199,10 @@ struct bub_step {
 };
 
 typedef struct bub_step Bubble_Step;
-#endif /* HAVE_XPM || HAVE_GDK_PIXBUF */
-
-/* Make sure default bubble isn't compiled when we don't have XPM
-Disable file I/O code too. */
-#if !defined(HAVE_XPM) && !defined(HAVE_GDK_PIXBUF)
-# define NO_DEFAULT_BUBBLE
-# undef BUBBLES_IO
-#endif /* !HAVE_XPM && !HAVE_GDK_PIXBUF */
-
-/* Make sure default bubble is compiled in when we have XPM and no file I/O */
-#if defined(HAVE_XPM) || defined(HAVE_GDK_PIXBUF)
-# ifndef BUBBLES_IO
-#  undef NO_DEFAULT_BUBBLE
-# endif /* BUBBLES_IO */
-#endif /* HAVE_XPM || HAVE_GDK_PIXBUF */
 
 extern void init_default_bubbles(void);
 extern int num_default_bubbles;
-extern char **default_bubbles[];
+typedef struct { const unsigned char *png; unsigned long size; } bubble_png;
+extern bubble_png default_bubbles[];
 
 #endif /* _BUBBLES_H_ */