From http://www.jwz.org/xscreensaver/xscreensaver-5.29.tar.gz

[xscreensaver] / hacks / glx / xpm-ximage.c

diff --git a/hacks/glx/xpm-ximage.c b/hacks/glx/xpm-ximage.c
index 4091c704a68754395f1a18da3f3d9eb8d48828a3..ea75d4f3e3c7b526e6fcbabda9963b9e17e0a640 100644 (file)
--- a/hacks/glx/xpm-ximage.c
+++ b/hacks/glx/xpm-ximage.c
@@ -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));