summaryrefslogtreecommitdiffstats
path: root/usr/share
diff options
context:
space:
mode:
authorDaniel Napora <napcok@gmail.com>2015-04-27 18:21:24 +0200
committerDaniel Napora <napcok@gmail.com>2015-04-27 18:21:24 +0200
commit896567785439928a7c231873bc2222582947a001 (patch)
tree25c07c5b4f35ef93457848ec5022b7228b03cf7d /usr/share
parent81d558406ad2ac242e019f3499f9024c276ec7d3 (diff)
downloadmageiawelcome-896567785439928a7c231873bc2222582947a001.tar
mageiawelcome-896567785439928a7c231873bc2222582947a001.tar.gz
mageiawelcome-896567785439928a7c231873bc2222582947a001.tar.bz2
mageiawelcome-896567785439928a7c231873bc2222582947a001.tar.xz
mageiawelcome-896567785439928a7c231873bc2222582947a001.zip
fix #129740.8.15
Diffstat (limited to 'usr/share')
-rw-r--r--usr/share/mageiawelcome/helpers.py8
-rw-r--r--usr/share/mageiawelcome/mageiawelcome.py3
2 files changed, 10 insertions, 1 deletions
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()