dom0/core: pass icon path to qubes_guid

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.

dom0/qvm-core/qubes.py

@@ -1498,7 +1498,7 @@ class QubesVm(object):
             print >> sys.stderr, "--> Starting Qubes GUId..."
         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:
             guid_cmd += ['-v', '-v']
         retcode = subprocess.call (guid_cmd)
@@ -2560,7 +2560,7 @@ class QubesHVm(QubesVm):
             if verbose:
                 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) :
                 raise QubesException("Cannot start qubes_guid!")
 

dom0/restore/qfile-daemon-dvm

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