xserver: Branch 'master'

[Daniel Stone]

 hw/xfree86/common/xf86Config.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 2e60ebbd254290e19492b97c960d9678513c94bf
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Oct 15 14:10:51 2008 +0100

    XFree86: Simplify DontZap/-retro interaction
    
    How hard could it possibly be, right?

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 5c2ea4b..536b53c 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -875,10 +875,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 
     xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
     xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
-    if (xf86IsOptionSet(FlagOptions, FLAG_DONTZAP))
-        xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
-    else
-        xf86Info.dontZap = party_like_its_1989;
+    if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
+        xf86Info.dontZap = !party_like_its_1989;
     xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
 
     xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);