projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...
[xscreensaver]
/
driver
/
xscreensaver-getimage.c
diff --git
a/driver/xscreensaver-getimage.c
b/driver/xscreensaver-getimage.c
index 67b59d0656be830aa2082bd494de4a1e79c1e174..7b8919774ae422c63b7d3534ae2ad9dc1cc28522 100644
(file)
--- a/
driver/xscreensaver-getimage.c
+++ b/
driver/xscreensaver-getimage.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 2001
, 2002, 2003
by Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2001
-2004
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
@@
-180,7
+180,7
@@
root_window_p (Screen *screen, Window window)
Atom type;
int format;
unsigned long nitems, bytesafter;
Atom type;
int format;
unsigned long nitems, bytesafter;
- char *version;
+
unsigned
char *version;
if (window != RootWindowOfScreen (screen))
return False;
if (window != RootWindowOfScreen (screen))
return False;
@@
-189,7
+189,7
@@
root_window_p (Screen *screen, Window window)
XInternAtom (dpy, "_SCREENSAVER_VERSION", False),
0, 1, False, XA_STRING,
&type, &format, &nitems, &bytesafter,
XInternAtom (dpy, "_SCREENSAVER_VERSION", False),
0, 1, False, XA_STRING,
&type, &format, &nitems, &bytesafter,
-
(unsigned char **)
&version)
+ &version)
== Success
&& type != None)
return False;
== Success
&& type != None)
return False;
@@
-1479,8
+1479,7
@@
get_image (Screen *screen,
video_p = False;
image_p = True;
}
video_p = False;
image_p = True;
}
-
- if (!dir || !*dir)
+ else if (!dir || !*dir)
{
if (verbose_p && image_p)
fprintf (stderr,
{
if (verbose_p && image_p)
fprintf (stderr,