wayland: Fix indentation
wayland: Don't leak an extra xdg_shell resource

No idea how this happened...
wayland: Use our named #define for the wl_shell version
wayland: Use a named #define for the xdg-shell version