more cleanup

zorg/zorg/consts.py

@@ -6,16 +6,12 @@ zorgConfigDir = "/var/lib/zorg"
 zorgConfig = "config.xml"
 zorgDataDir = "/usr/share/zorg"
 
-DriversDB = "/usr/lib/X11/DriversDB"
-MonitorsDB = "/usr/lib/X11/MonitorsDB"
+DriversDB = "%s/DriversDB" % zorgDataDir
+MonitorsDB = "%s/MonitorsDB" % zorgDataDir
 
 driver_path = "/usr/lib/xorg/modules/drivers"
 xkb_path = "/usr/share/X11/xkb/symbols"
 
 sysdir = "/sys/bus/pci/devices/"
 
-lcd_drivers = ["nv", "nvidia", "ati", "via", "i810",
-               "intel", "sis", "savage", "neomagic"]
-truecolor_cards = ["i810", "intel", "nv", "radeon"]
-
 package_sep = "/"

zorg/zorg/probe.py

@@ -160,16 +160,13 @@ class VideoDevice:
         if self.package:
             self.probe_result = call(self.package, "Xorg.Driver", "probe", self.getDict())
 
-        if self.probe_result is None:
-            self.probe_result = {
-                "flags":        "",
-                "outputs":      "default",
-                "tv-standards": ""
-                }
-
-            if self.driver in truecolor_cards:
-                self.probe_result["depths"] = "24,16"
-            else:
+            if self.probe_result is None:
+                self.probe_result = {
+                    "flags":        "",
+                    "outputs":      "default",
+                    "tv-standards": ""
+                    }
+
                 self.probe_result["depths"] = "16,24"
 
         depthlist = self.probe_result.get("depths", "16,24").split(",")