summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Halse Rogers <christopher.halse.rogers@canonical.com>2012-01-05 01:22:40 +0000
committerKeith Packard <keithp@keithp.com>2012-01-09 13:09:48 -0800
commit63a8012947fc44ccb3d661dec88dbda14e7f3c04 (patch)
treeff3d91fb7f7e645884a2d82b8bd944ae1fc9813a
parentef492e9797b6d4f6bbc25e86bedc24477819fde7 (diff)
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>
-rw-r--r--dix/property.c2
1 files changed, 1 insertions, 1 deletions
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))
{