[PATCH 2/2] Revert "dix: don't return BadMatch from GetProperty (#23562)"

Christopher James Halse Rogers christopher.halse.rogers at canonical.com
Wed Jan 4 17:22:40 PST 2012


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 at canonical.com>
---
 dix/property.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dix/property.c b/dix/property.c
index a1ae530..d933d5c 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))
     {
-- 
1.7.7.3



More information about the xorg-devel mailing list