xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 dix/events.c                   |    4 ++--
 hw/xfree86/common/xf86Config.c |    4 ++--
 xkb/xkbAccessX.c               |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d84a2f855da9fd293e984084168c1e27f5a5115c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sun Mar 1 16:59:14 2009 +1000

    xfree86: Add linebreak to two debug statements.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index aa4ea05..b9ab11a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1670,7 +1670,7 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
         idp = (XF86ConfInactivePtr)idp->list.next;
     }
 #ifdef DEBUG
-    ErrorF("Found %d inactive devices in the layout section %s",
+    ErrorF("Found %d inactive devices in the layout section %s\n",
            count, conf_layout->lay_identifier);
 #endif
     gdp = xnfalloc((count + 1) * sizeof(GDevRec));
@@ -1695,7 +1695,7 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
         irp = (XF86ConfInputrefPtr)irp->list.next;
     }
 #ifdef DEBUG
-    ErrorF("Found %d input devices in the layout section %s",
+    ErrorF("Found %d input devices in the layout section %s\n",
            count, conf_layout->lay_identifier);
 #endif
     indp = xnfcalloc((count + 1), sizeof(IDevPtr));
commit e0ed9f16d0ab871f3209837f54055446503c4108
Author: Jason Vas Dias <jason.vas.dias at gmail.com>
Date:   Tue Mar 3 13:24:54 2009 +1000

    Fix build with --enable-debug.
    
    [amended by Peter Hutterer]
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/events.c b/dix/events.c
index 881e4c5..8c9623b 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3673,9 +3673,9 @@ FixKeyState (DeviceEvent *event, DeviceIntPtr keybd)
     kptr = &keyc->down[key >> 3];
     bit = 1 << (key & 7);
 
-    if ((event->type == ET_KeyPress)||(event->type == ET_KeyRelease)) {
+    if (event->type == ET_KeyPress) {
 	DebugF("FixKeyState: Key %d %s\n",key,
-               (((event->type == ET_KeyPress)||(event->type == ET_DeviceKeyPress)) ? "down" : "up"));
+               ((event->type == ET_KeyPress) ? "down" : "up"));
     }
 
     if (event->type == ET_KeyPress)
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 524bb53..9bf8714 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -133,7 +133,7 @@ AccessXKeyboardEvent(DeviceIntPtr	keybd,
 
     if (xkbDebugFlags&0x8) {
 	DebugF("[xkb] AXKE: Key %d %s\n", keyCode,
-               (event->type == ET_KeyPress ? "down" : "up"));
+               (event.type == ET_KeyPress ? "down" : "up"));
     }
 
     if (!_XkbIsPressEvent(type) && isRepeat)