From a2266adf355b5a58ff5c6646e4d3ba1587e775ac Mon Sep 17 00:00:00 2001 From: Papoteur Date: Wed, 19 Jul 2017 22:54:22 +0200 Subject: Update identification of desktops, suppressing path in DESKTOP_SESSION (mga#21229) --- usr/share/mageiawelcome/helpers.py | 2 +- usr/share/mageiawelcome/mageiawelcome.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'usr') diff --git a/usr/share/mageiawelcome/helpers.py b/usr/share/mageiawelcome/helpers.py index a8148d3..9cf55d7 100644 --- a/usr/share/mageiawelcome/helpers.py +++ b/usr/share/mageiawelcome/helpers.py @@ -12,7 +12,7 @@ launch = _("Launch") def get_desktop_name(x): return { - '01KDE4':'KDE', + '01plasma':'KDE', '02GNOME':'Gnome', 'gnome': 'Gnome Wayland', 'gnome-xorg': 'Gnome X.org', diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py index 4c7219d..f553bd6 100644 --- a/usr/share/mageiawelcome/mageiawelcome.py +++ b/usr/share/mageiawelcome/mageiawelcome.py @@ -50,7 +50,7 @@ def main(): arch = '32-bit' home = os.getenv("HOME") username = os.getenv("USER") - desktop = get_desktop_name(os.getenv("DESKTOP_SESSION")) + desktop = get_desktop_name(os.path.basename(os.getenv("DESKTOP_SESSION"))) if desktop == 'Other': desktop = get_desktop_name2(os.getenv("XDG_CURRENT_DESKTOP")) -- cgit v1.2.1