summaryrefslogtreecommitdiffstats
path: root/abs/core/LinHES-system/msg_daemon.py
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2013-01-11 22:43:37 (GMT)
committerJames Meyer <james.meyer@operamail.com>2013-01-11 22:43:37 (GMT)
commite91a04796733c19b1fafab5ec974c4aeb11eca3c (patch)
tree85cca5d6c0c2b3159995a3f76dd6b549e86cc543 /abs/core/LinHES-system/msg_daemon.py
parent3d0a10290106d0da8902bd4b7b622eb7c66adf2e (diff)
downloadlinhes_pkgbuild-e91a04796733c19b1fafab5ec974c4aeb11eca3c.zip
linhes_pkgbuild-e91a04796733c19b1fafab5ec974c4aeb11eca3c.tar.gz
linhes_pkgbuild-e91a04796733c19b1fafab5ec974c4aeb11eca3c.tar.bz2
LinHES-system: make E and enhanced the default windowmanger. As a side effect supplemental web also becomes the default.
refs #895
Diffstat (limited to 'abs/core/LinHES-system/msg_daemon.py')
-rwxr-xr-xabs/core/LinHES-system/msg_daemon.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index 0e54824..8601075 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -243,20 +243,21 @@ class msg_queue_runner(threading.Thread):
self.out_xosd = msg_xosd()
def get_current_style(self):
- style = "default"
+ style = "enhanced"
if os.path.exists('/etc/X11/WINDOWMANAGER'):
command = ['bash', '-c', 'source /etc/X11/WINDOWMANAGER && echo $STARTUP_STYLE']
proc = subprocess.Popen(command, stdout = subprocess.PIPE)
-
+ #default
for line in proc.stdout:
if line.strip() == "":
- style = "default"
+ style = "enhanced"
else:
style = line.strip()
break
proc.communicate()
else:
- style = "default"
+ #default
+ style = "enhanced"
return style
@@ -265,7 +266,7 @@ class msg_queue_runner(threading.Thread):
#print "Killing current display"
if style == "enhanced":
self.p.terminate()
- elif style == "default":
+ elif style == "legacy":
#self.p.terminate()
self.out_xosd.kill()
@@ -284,7 +285,7 @@ class msg_queue_runner(threading.Thread):
self.p = multiprocessing.Process(target=self.out_msg.display, args=(msgtext,display_time))
self.p.start()
self.p.join()
- elif style == "default":
+ elif style == "legacy":
#display_time = int(msgdict['timeout'])
self.out_xosd.display(msgtext,display_time)