Merge branch 'main' into lenemter/fix-xsettings

Author: lenemter

src/WindowManager.vala

@@ -334,8 +334,7 @@ namespace Gala {
             // Most things inside this "later" depend on GTK. We get segfaults if we try to do GTK stuff before the window manager
             // is initialized, so we hold this stuff off until we're ready to draw
             laters.add (Meta.LaterType.BEFORE_REDRAW, () => {
-                unowned string xdg_session_type = Environment.get_variable ("XDG_SESSION_TYPE");
-                if (xdg_session_type == "x11") {
+                if (!Meta.Util.is_wayland_compositor ()) {
                     string[] args = {};
                     unowned string[] _args = args;
                     Gtk.init (ref _args);