Merge remote-tracking branch 'qubesos/pr/55'

* qubesos/pr/55:
  Change way of detection KDE so that it detects KWin in other environments
This commit is contained in:
Marek Marczykowski-Górecki 2016-09-09 12:49:44 +02:00
commit aba371e4fb
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -1783,8 +1783,8 @@ class QubesVm(object):
# Avoid using environment variables for checking the current session,
# because this script may be called with cleared env (like with sudo).
if subprocess.check_output(
['xprop', '-root', '-notype', 'KDE_SESSION_VERSION']) == \
'KDE_SESSION_VERSION = 5\n':
['xprop', '-root', '-notype', 'KWIN_RUNNING']) == \
'KWIN_RUNNING = 0x1\n':
# native decoration plugins is used, so adjust window properties
# accordingly
guid_cmd += ['-T'] # prefix window titles with VM name