From 56044e67a58c5a20422fab027eb6526f6204ac1b Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan@octopull.co.uk>
Date: Fri, 4 Oct 2024 21:18:57 +0100
Subject: [PATCH] [x11-kiosk] change enable-x11 default

---
 examples/mir-x11-kiosk/mir-x11-kiosk-launch.sh | 2 +-
 examples/mir-x11-kiosk/x11_kiosk_main.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/mir-x11-kiosk/mir-x11-kiosk-launch.sh b/examples/mir-x11-kiosk/mir-x11-kiosk-launch.sh
index a1334bcda4a..b468f38402a 100755
--- a/examples/mir-x11-kiosk/mir-x11-kiosk-launch.sh
+++ b/examples/mir-x11-kiosk/mir-x11-kiosk-launch.sh
@@ -9,7 +9,7 @@ unset WAYLAND_DISPLAY
 # ${x11_display_file} will contain the X11 display
 x11_display_file=$(mktemp)
 
-MIR_SERVER_ENABLE_X11=1 "${bindir}"mir-x11-kiosk --x11-displayfd 5 5>"${x11_display_file}"&
+"${bindir}"mir-x11-kiosk --x11-displayfd 5 5>"${x11_display_file}"&
 mir_kiosk_x11_pid=$!
 
 inotifywait --event close_write "${x11_display_file}"
diff --git a/examples/mir-x11-kiosk/x11_kiosk_main.cpp b/examples/mir-x11-kiosk/x11_kiosk_main.cpp
index 4db4b5d31c1..f475cbdf0bf 100644
--- a/examples/mir-x11-kiosk/x11_kiosk_main.cpp
+++ b/examples/mir-x11-kiosk/x11_kiosk_main.cpp
@@ -36,6 +36,6 @@ int main(int argc, char const* argv[])
             display_config.layout_option(),
             set_window_management_policy<X11KioskWindowManagerPolicy>(),
             Keymap{},
-            X11Support{}
+            X11Support{}.default_to_enabled()
         });
 }