[x11-kiosk] change enable-x11 default (#3621)

canonical · Oct 5, 2024 · 8cccc26 · 8cccc26
2 parents ad96185 + 56044e6
commit 8cccc26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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()
         });
 }