Module Name: xsrc
Committed By: mrg
Date: Sun Nov 21 03:49:12 UTC 2010
Modified Files:
xsrc/external/mit/xrandr/dist: xrandr.c
Removed Files:
xsrc/external/mit/xinit/dist: compile startx.cmd xinit.def xinitrc.cmd
xsrc/external/mit/xinit/dist/privileged_startx: ._privileged_startx.c
xsrc/external/mit/xkbcomp/dist: AUTHORS NEWS
xsrc/external/mit/xkbevd/dist: AUTHORS NEWS
xsrc/external/mit/xkbutils/dist: AUTHORS NEWS
xsrc/external/mit/xsm/dist: AUTHORS NEWS XSm.ad compile globals.c
mkinstalldirs
xsrc/external/mit/xstdcmap/dist: AUTHORS NEWS compile mkinstalldirs
xsrc/external/mit/xvinfo/dist: AUTHORS NEWS
Log Message:
merge cornflakes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xinit/dist/compile \
xsrc/external/mit/xinit/dist/startx.cmd \
xsrc/external/mit/xinit/dist/xinitrc.cmd
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xinit/dist/xinit.def
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xinit/dist/privileged_startx/._privileged_startx.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkbcomp/dist/AUTHORS \
xsrc/external/mit/xkbcomp/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkbevd/dist/AUTHORS \
xsrc/external/mit/xkbevd/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkbutils/dist/AUTHORS \
xsrc/external/mit/xkbutils/dist/NEWS
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xrandr/dist/xrandr.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xsm/dist/AUTHORS \
xsrc/external/mit/xsm/dist/NEWS xsrc/external/mit/xsm/dist/XSm.ad \
xsrc/external/mit/xsm/dist/compile xsrc/external/mit/xsm/dist/globals.c \
xsrc/external/mit/xsm/dist/mkinstalldirs
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xstdcmap/dist/AUTHORS \
xsrc/external/mit/xstdcmap/dist/NEWS \
xsrc/external/mit/xstdcmap/dist/compile \
xsrc/external/mit/xstdcmap/dist/mkinstalldirs
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xvinfo/dist/AUTHORS \
xsrc/external/mit/xvinfo/dist/NEWS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xrandr/dist/xrandr.c
diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.4 xsrc/external/mit/xrandr/dist/xrandr.c:1.5
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.4 Sat Aug 14 09:14:01 2010
+++ xsrc/external/mit/xrandr/dist/xrandr.c Sun Nov 21 03:49:11 2010
@@ -2681,7 +2681,8 @@
root = RootWindow (dpy, screen);
- if (!XRRQueryVersion (dpy, &major, &minor))
+ if (!XRRQueryExtension (dpy, &event_base, &error_base) ||
+ !XRRQueryVersion (dpy, &major, &minor))
{
fprintf (stderr, "RandR extension missing\n");
exit (1);
@@ -3374,8 +3375,6 @@
root,
(SizeID) size, (Rotation) (rotation | reflection), rate, CurrentTime);
- XRRQueryExtension(dpy, &event_base, &error_base);
-
if (setit && !dryrun && status == RRSetConfigFailed) {
printf ("Failed to change the screen configuration!\n");
ret = 1;
