From f4f40077a23245d1baf26d18bf4160202df67c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 30 Sep 2024 15:52:56 -0700 Subject: [PATCH 1/2] Main: don't start settings daemon in installer session --- compositor/main.vala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compositor/main.vala b/compositor/main.vala index df2e12ed7..6d441be97 100644 --- a/compositor/main.vala +++ b/compositor/main.vala @@ -32,8 +32,10 @@ namespace GreeterCompositor { // overrides GLib.Environment.set_variable ("XDG_CURRENT_DESKTOP", "Pantheon", true); - var settings_daemon = new SettingsDaemon (); - settings_daemon.start (); + if (GLib.Environment.get_variable ("DESKTOP_SESSION") != "installer") { + var settings_daemon = new SettingsDaemon (); + settings_daemon.start (); + } var ctx = new Meta.Context ("Mutter(GreeterCompositor)"); ctx.add_option_entries (GreeterCompositor.OPTIONS, Constants.GETTEXT_PACKAGE); From 8942424302b103db3ca57d69a522fa6c5346b5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 2 Oct 2024 11:21:12 -0700 Subject: [PATCH 2/2] Also make sure we don't set desktop in installer session --- compositor/main.vala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compositor/main.vala b/compositor/main.vala index 6d441be97..2df5d5904 100644 --- a/compositor/main.vala +++ b/compositor/main.vala @@ -28,11 +28,11 @@ namespace GreeterCompositor { } public static int main (string[] args) { - // Ensure we present ourselves as Pantheon so we pick up the right GSettings - // overrides - GLib.Environment.set_variable ("XDG_CURRENT_DESKTOP", "Pantheon", true); - if (GLib.Environment.get_variable ("DESKTOP_SESSION") != "installer") { + // Ensure we present ourselves as Pantheon so we pick up the right GSettings + // overrides + GLib.Environment.set_variable ("XDG_CURRENT_DESKTOP", "Pantheon", true); + var settings_daemon = new SettingsDaemon (); settings_daemon.start (); }