leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: thorough detection of desktop environment

Browse source
This commit is contained in:
Ron Waldon-Howe 2024-01-10 14:07:30 +11:00 • committed by Michael Murphy
parent 890dd1c21d
commit f2148eed9a
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pages/system/src/about.rs
View file

@ -74,7 +74,13 @@ impl Info {
info.windowing_system = session; info.windowing_system = session;
} }
if let Ok(mut session) = std::env::var("DESKTOP_SESSION") { // prefer XDG_SESSION_DESKTOP because the value is singular: https://www.freedesktop.org/software/systemd/man/latest/pam_systemd.html
if let Ok(mut session) = std::env::var("XDG_SESSION_DESKTOP")
// otherwise, XDG_CURRENT_DESKTOP (could be plural): https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
.or_else(|_| std::env::var("XDG_CURRENT_DESKTOP"))
// fallback to legacy environment variable
.or_else(|_| std::env::var("DESKTOP_SESSION"))
{
if let Some(first) = session.get_mut(0..1) { if let Some(first) = session.get_mut(0..1) {
first.make_ascii_uppercase(); first.make_ascii_uppercase();
} }