From 63a8012947fc44ccb3d661dec88dbda14e7f3c04 Mon Sep 17 00:00:00 2001
From: Chris Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu, 5 Jan 2012 01:22:40 +0000
Subject: Revert "dix: don't return BadMatch from GetProperty (#23562)"

This reverts commit f04fe06ae244b851b38be824b1a80f2f8a030591.

dixLookupWindow no longer returns BadMatch. No other caller was checking
for it, so this problem is now fixed in the utility function.

Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 dix/property.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/property.c b/dix/property.c
index a1ae5305d..d933d5cec 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -474,7 +474,7 @@ ProcGetProperty(ClientPtr client)
     }
     rc = dixLookupWindow(&pWin, stuff->window, client, win_mode);
     if (rc != Success)
-	return (rc == BadMatch) ? BadWindow : rc;
+	return rc;
 
     if (!ValidAtom(stuff->property))
     {
-- 
cgit v1.2.3