From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 23 Mar 2012 10:05:55 +0100
Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git
 update 23 Mar 2012

---
 xorg-server/Xi/ungrdevk.c | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'xorg-server/Xi/ungrdevk.c')

diff --git a/xorg-server/Xi/ungrdevk.c b/xorg-server/Xi/ungrdevk.c
index 8785989b0..3273878d3 100644
--- a/xorg-server/Xi/ungrdevk.c
+++ b/xorg-server/Xi/ungrdevk.c
@@ -54,8 +54,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"	/* DeviceIntPtr      */
-#include "windowstr.h"	/* window structure  */
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "exglobals.h"
@@ -106,32 +106,33 @@ ProcXUngrabDeviceKey(ClientPtr client)
 
     rc = dixLookupDevice(&dev, stuff->grabbed_device, client, DixGrabAccess);
     if (rc != Success)
-	return rc;
+        return rc;
     if (dev->key == NULL)
-	return BadMatch;
+        return BadMatch;
 
     if (stuff->modifier_device != UseXKeyboard) {
-	rc = dixLookupDevice(&mdev, stuff->modifier_device, client,
-			     DixReadAccess);
-	if (rc != Success)
-	    return BadDevice;
-	if (mdev->key == NULL)
-	    return BadMatch;
-    } else
-	mdev = PickKeyboard(client);
+        rc = dixLookupDevice(&mdev, stuff->modifier_device, client,
+                             DixReadAccess);
+        if (rc != Success)
+            return BadDevice;
+        if (mdev->key == NULL)
+            return BadMatch;
+    }
+    else
+        mdev = PickKeyboard(client);
 
     rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
-	return rc;
+        return rc;
 
     if (((stuff->key > dev->key->xkbInfo->desc->max_key_code) ||
-	 (stuff->key < dev->key->xkbInfo->desc->min_key_code))
-	&& (stuff->key != AnyKey))
-	return BadValue;
+         (stuff->key < dev->key->xkbInfo->desc->min_key_code))
+        && (stuff->key != AnyKey))
+        return BadValue;
 
     if ((stuff->modifiers != AnyModifier) &&
-	(stuff->modifiers & ~AllModifiersMask))
-	return BadValue;
+        (stuff->modifiers & ~AllModifiersMask))
+        return BadValue;
 
     temporaryGrab = AllocGrab();
     if (!temporaryGrab)
-- 
cgit v1.2.3