Fix wrapping/unwrapping of X11 hooks

The functions might change so we need to also make sure we grab
the updated value after each call. Clean up the code to use the
same style as the rest of the Xorg code.
1 file changed