the earlier patch was rather blunt and forced xdg directories in all cases, this new solution is less ugly and will be easier to upstream.