From 27fdf5af170bf355b6da32e11e3135e99a5e675a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 28 Feb 2025 16:11:55 +0100 Subject: src/utils.h: On Linux Desktop, if Lomiri is running, but not Ubuntu Touch, then DESKTOP_SESSION is set to 'lomiri'. --- src/utils.h | 2 +- tests/tst_utils.cpp | 2 +- tests/tst_utils.vala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils.h b/src/utils.h index c7c658e..efb3ec7 100644 --- a/src/utils.h +++ b/src/utils.h @@ -30,7 +30,7 @@ static const char * const DESKTOP_GNOME = "GNOME"; static const char * const DESKTOP_XFCE = "XFCE"; static const char * const DESKTOP_PANTHEON = "PANTHEON"; static const char * const DESKTOP_BUDGIE = "Budgie"; -static const char * const SESSION_LOMIRI = "ubuntu-touch"; +static const char * const SESSION_LOMIRI = "lomiri"; static const char * const SESSION_UBUNTUTOUCH = "ubuntu-touch"; static const char * const SESSION_UNITY = NULL; static const char * const SESSION_MATE = "mate"; diff --git a/tests/tst_utils.cpp b/tests/tst_utils.cpp index 0d59da0..4f85d68 100644 --- a/tests/tst_utils.cpp +++ b/tests/tst_utils.cpp @@ -43,7 +43,7 @@ TEST_F(XdgCurrentDesktopUtilsTest, isLomiri) unsetenv("XDG_CURRENT_DESKTOP"); unsetenv("DESKTOP_SESSION"); EXPECT_FALSE(ayatana_common_utils_is_lomiri()); - setenv("DESKTOP_SESSION", "ubuntu-touch", 1); + setenv("DESKTOP_SESSION", "lomiri", 1); EXPECT_TRUE(ayatana_common_utils_is_lomiri()); setenv("XDG_CURRENT_DESKTOP", "Lomiri", 1); EXPECT_TRUE(ayatana_common_utils_is_lomiri()); diff --git a/tests/tst_utils.vala b/tests/tst_utils.vala index 4d070e7..3762364 100644 --- a/tests/tst_utils.vala +++ b/tests/tst_utils.vala @@ -9,7 +9,7 @@ static int main(string[] args) unset_variable("DESKTOP_SESSION"); unset_variable("XDG_CURRENT_DESKTOP"); assert(! utils_is_lomiri()); - set_variable("DESKTOP_SESSION", "ubuntu-touch", true); + set_variable("DESKTOP_SESSION", "lomiri", true); assert(utils_is_lomiri()); set_variable("XDG_CURRENT_DESKTOP", "Lomiri", true); assert(utils_is_lomiri()); -- cgit v1.2.3