X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fxpm-ximage.c;h=024f95bc1277d5f8ca1410834fe9e150a8bd76b4;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=4091c704a68754395f1a18da3f3d9eb8d48828a3;hpb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;p=xscreensaver

diff --git a/hacks/glx/xpm-ximage.c b/hacks/glx/xpm-ximage.c
index 4091c704..024f95bc 100644
--- a/hacks/glx/xpm-ximage.c
+++ b/hacks/glx/xpm-ximage.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
 # include "jwxyz.h"
 #else
 # include <X11/Xlib.h>
@@ -78,7 +78,9 @@ xpm_to_ximage_1 (Display *dpy, Visual *visual, Colormap cmap,
   if (!initted)
     {
 #ifdef HAVE_GTK2
+#if !GLIB_CHECK_VERSION(2, 36 ,0)
       g_type_init ();
+#endif
 #endif
       gdk_pixbuf_xlib_init (dpy, DefaultScreen (dpy));
       xlib_rgb_init (dpy, DefaultScreenOfDisplay (dpy));