XDG_DESKTOP_DIR is still present in ~/.config/user-dirs, so I guess my latest patch has actually regressed things.
XDG_DESKTOP_DIR is still present in ~/.config/ user-dirs, so I guess my latest patch has actually regressed things.