X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-getimage.c;h=f22504e95e80e0f0042151c27a5aab6d027fe71f;hb=dba664f31aa87285db4d76cf8c5e66335299703a;hp=7123265cfdbbb911c594ac8032cdb6c1c3d6a8dd;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver

diff --git a/driver/xscreensaver-getimage.c b/driver/xscreensaver-getimage.c
index 7123265c..f22504e9 100644
--- a/driver/xscreensaver-getimage.c
+++ b/driver/xscreensaver-getimage.c
@@ -381,7 +381,9 @@ read_file_gdk (Screen *screen, Window window, Drawable drawable,
 
   gdk_pixbuf_xlib_init_with_depth (dpy, screen_number (screen), win_depth);
 # ifdef HAVE_GTK2
+# if !GLIB_CHECK_VERSION(2, 36 ,0)
   g_type_init();
+# endif
 # else  /* !HAVE_GTK2 */
   xlib_rgb_init (dpy, screen);
 # endif /* !HAVE_GTK2 */
@@ -1719,7 +1721,7 @@ get_image (Screen *screen,
         /* Replace slashes with newlines */
         /* while ((dot = strchr(f2, '/'))) *dot = '\n'; */
         /* Replace slashes with spaces */
-        while ((dot = strchr(f2, '/'))) *dot = ' ';
+        /* while ((dot = strchr(f2, '/'))) *dot = ' '; */
 
         XChangeProperty (dpy, window, a, XA_STRING, 8, PropModeReplace, 
                          (unsigned char *) f2, strlen(f2));