projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.36.tar.gz
[xscreensaver]
/
driver
/
xscreensaver-getimage.c
diff --git
a/driver/xscreensaver-getimage.c
b/driver/xscreensaver-getimage.c
index 7123265cfdbbb911c594ac8032cdb6c1c3d6a8dd..f702f679294f7c05f353f1ed18ad5460e4987bb3 100644
(file)
--- a/
driver/xscreensaver-getimage.c
+++ b/
driver/xscreensaver-getimage.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 2001-201
3
by Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2001-201
6
by Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-69,7
+69,7
@@
/* On MacOS under X11, the usual X11 mechanism of getting a screen shot
doesn't work, and we need to use an external program. This is only
used when running under X11 on MacOS. If it's a Cocoa build, this
/* On MacOS under X11, the usual X11 mechanism of getting a screen shot
doesn't work, and we need to use an external program. This is only
used when running under X11 on MacOS. If it's a Cocoa build, this
- path is not taken, and OSX/
osxgrabscreen
.m is used instead.
+ path is not taken, and OSX/
grabclient-osx
.m is used instead.
*/
# define USE_EXTERNAL_SCREEN_GRABBER
#endif
*/
# define USE_EXTERNAL_SCREEN_GRABBER
#endif
@@
-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
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();
g_type_init();
+# endif
# else /* !HAVE_GTK2 */
xlib_rgb_init (dpy, screen);
# endif /* !HAVE_GTK2 */
# 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 */
/* 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));
XChangeProperty (dpy, window, a, XA_STRING, 8, PropModeReplace,
(unsigned char *) f2, strlen(f2));