From b3d0afc3602688a275cb87b5733515ef09146a27 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Wed, 7 Mar 2012 18:50:56 +0100
Subject: [PATCH] dom0/dispvm: clone QubesVmLabel object for DispVM

---
 dom0/qvm-core/qubes.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 01963dea..07b28563 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -177,6 +177,17 @@ QubesVmLabels = {
     "black" : QubesVmLabel ("black", 8),
 }
 
+QubesDispVmLabels = {
+    "red" : QubesVmLabel ("red", 1, icon="dispvm-red"),
+    "orange" : QubesVmLabel ("orange", 2, icon="dispvm-orange"),
+    "yellow" : QubesVmLabel ("yellow", 3, icon="dispvm-yellow"),
+    "green" : QubesVmLabel ("green", 4, color="0x5fa05e", icon="dispvm-green"),
+    "gray" : QubesVmLabel ("gray", 5, icon="dispvm-gray"),
+    "blue" : QubesVmLabel ("blue", 6, icon="dispvm-blue"),
+    "purple" : QubesVmLabel ("purple", 7, color="0xb83374", icon="dispvm-purple"),
+    "black" : QubesVmLabel ("black", 8, icon="dispvm-black"),
+}
+
 default_appvm_label = QubesVmLabels["red"]
 default_template_label = QubesVmLabels["gray"]
 default_servicevm_label = QubesVmLabels["red"]
@@ -1993,9 +2004,9 @@ class QubesDisposableVm(QubesVm):
         super(QubesDisposableVm, self).__init__(dir_path="/nonexistent", **kwargs)
 
         # Use DispVM icon with the same color
-        self._label.icon = "dispvm-" + self.label.icon
-        self._label.icon_path = "/usr/share/qubes/icons/" + self.label.icon + ".png"
-        self.icon_path = self._label.icon_path
+        if self._label:
+            self._label = QubesDispVmLabels[self._label.name]
+            self.icon_path = self._label.icon_path
 
     @property
     def type(self):