X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fxpm-pixmap.c;h=5e13a18e22ed487de49ee384b3a7586238585769;hp=9493e093583823a41d29348d7699bb8f240d7e35;hb=dba664f31aa87285db4d76cf8c5e66335299703a;hpb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6

diff --git a/hacks/xpm-pixmap.c b/hacks/xpm-pixmap.c
index 9493e093..5e13a18e 100644
--- a/hacks/xpm-pixmap.c
+++ b/hacks/xpm-pixmap.c
@@ -61,7 +61,9 @@ xpm_to_pixmap_1 (Display *dpy, Window window,
   if (!initted)
     {
 #ifdef HAVE_GTK2
+#if !GLIB_CHECK_VERSION(2, 36 ,0)
       g_type_init ();
+#endif
 #endif /* HAVE_GTK2 */
       gdk_pixbuf_xlib_init (dpy, screen_number (xgwa.screen));
       xlib_rgb_init (dpy, xgwa.screen);