From 896567785439928a7c231873bc2222582947a001 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Mon, 27 Apr 2015 18:21:24 +0200
Subject: fix #12974

---
 usr/share/mageiawelcome/helpers.py       | 8 +++++++-
 usr/share/mageiawelcome/mageiawelcome.py | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/share/mageiawelcome/helpers.py b/usr/share/mageiawelcome/helpers.py
index 7bcf8b2..697bdb4 100644
--- a/usr/share/mageiawelcome/helpers.py
+++ b/usr/share/mageiawelcome/helpers.py
@@ -16,7 +16,6 @@ def get_desktop_name(x):
     '02GNOME':'Gnome',
     'gnome': 'Gnome',
     'LXDE':'LXDE',
-    '06xfce4':'XFCE',
     '10MATE':'Mate',
     '10Cinnamon':'Cinnamon',
     '05RazorDesktop':'RazorQt',
@@ -26,6 +25,13 @@ def get_desktop_name(x):
     '03WindowMaker':'WindowMaker',
     '09Fvwm2':'Fvwm2',
   }.get(x,'Other')
+
+def get_desktop_name2(x):
+  return {
+      'KDE':'KDE',
+      'XFCE':'Xfce',
+      'LXQt':'LXQt',
+    }.get(x,'unknown')
   
 def get_irc_client():
   if os.path.exists("/usr/bin/hexchat"): irc_client = "/usr/bin/hexchat &"
diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py
index 2cff6fd..71bdf68 100644
--- a/usr/share/mageiawelcome/mageiawelcome.py
+++ b/usr/share/mageiawelcome/mageiawelcome.py
@@ -53,6 +53,9 @@ def main():
     username = os.getenv("USER")
     desktop = get_desktop_name(os.getenv("DESKTOP_SESSION"))
     
+    if desktop == 'Other':
+      desktop = get_desktop_name2(os.getenv("XDG_CURRENT_DESKTOP"))
+    
    
     #collect packages nad its status
     listapp = get_listapp()
-- 
cgit v1.2.1