Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dom0/core: pass icon path to qubes_guid

Browse Source 
GUI daemon now is able to load the icon (when path given) and publish it to X
server. This makes possible to have VM name in WM_CLASS property (instead of
icon name) to fix window grouping in KDE.
This commit is contained in:
Marek Marczykowski 2013-02-19 01:07:24 +01:00
parent b214fa6f9d
commit 7051960d6a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom0/qvm-core/qubes.py
View File

@ -1498,7 +1498,7 @@ class QubesVm(object):
print >> sys.stderr, "--> Starting Qubes GUId..." print >> sys.stderr, "--> Starting Qubes GUId..."
xid = self.get_xid() xid = self.get_xid()
guid_cmd = [qubes_guid_path, "-d", str(xid), "-c", self.label.color, "-i", self.label.icon, "-l", str(self.label.index)] guid_cmd = [qubes_guid_path, "-d", str(xid), "-c", self.label.color, "-i", self.label.icon_path, "-l", str(self.label.index)]
if self.debug: if self.debug:
guid_cmd += ['-v', '-v'] guid_cmd += ['-v', '-v']
retcode = subprocess.call (guid_cmd) retcode = subprocess.call (guid_cmd)
@ -2560,7 +2560,7 @@ class QubesHVm(QubesVm):
if verbose: if verbose:
print >> sys.stderr, "--> Starting Qubes GUId..." print >> sys.stderr, "--> Starting Qubes GUId..."
retcode = subprocess.call ([qubes_guid_path, "-d", str(self.stubdom_xid), "-c", self.label.color, "-i", self.label.icon, "-l", str(self.label.index)]) retcode = subprocess.call ([qubes_guid_path, "-d", str(self.stubdom_xid), "-c", self.label.color, "-i", self.label.icon_path, "-l", str(self.label.index)])
if (retcode != 0) : if (retcode != 0) :
raise QubesException("Cannot start qubes_guid!") raise QubesException("Cannot start qubes_guid!")

2
dom0/restore/qfile-daemon-dvm
View File

@ -73,7 +73,7 @@ class QfileDaemonDvm:
current_dvm_conf, current_dvm_conf,
'-u', str(vm.default_user), '-u', str(vm.default_user),
'-c', label.color, '-c', label.color,
'-i', label.icon, '-i', label.icon_path,
'-l', str(label.index)]) '-l', str(label.index)])
qmemman_client.close() qmemman_client.close()
if retcode != 0: if retcode != 0: