fix color depth setting problem, added straight server entries to cards

4 files changed, 32 insertions, 3 deletions

diff --git a/po/pl.po b/po/pl.po
index a902f9cba..cc1aa3813 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -786,7 +786,7 @@ msgstr "Szukanie pakietów do uaktualnienia..."
 
 #: ../todo.py:749
 msgid "Rebuild of RPM database failed. You may be out of disk space?"
-msgstr ""
+msgstr "Błąd podczas przebudowy bazy RPM. Może masz za mało miejsca na sysku?"
 
 #: ../todo.py:967
 msgid "Processing"
diff --git a/rpmmodule/rpmmodule.c b/rpmmodule/rpmmodule.c
index 1d79f219f..3e943d768 100644
--- a/rpmmodule/rpmmodule.c
+++ b/rpmmodule/rpmmodule.c
@@ -927,8 +927,11 @@ static PyObject * hdrSubscript(hdrObject * s, PyObject * item) {
 	tag = PyInt_AsLong(item);
     } else if (PyString_Check(item)) {
 	str = PyString_AsString(item);
-	for (i = 0; i < rpmTagTableSize; i++)
+	printf ("CHECK %d\n", strcasecmp("VERSION", "version"));
+	for (i = 0; i < rpmTagTableSize; i++) {
+	    printf ("get header %s <-> %s\n", rpmTagTable[i].name + 7, str);
 	    if (!strcasecmp(rpmTagTable[i].name + 7, str)) break;
+	}
 	if (i < rpmTagTableSize) tag = rpmTagTable[i].val;
         if (tag == -1) {
             /* if we still don't have the tag, go looking for the header
diff --git a/rpmmodule/testhdr b/rpmmodule/testhdr
index bffa20448..af19434ae 100755
--- a/rpmmodule/testhdr
+++ b/rpmmodule/testhdr
@@ -2,6 +2,10 @@
 
 import rpm
 import sys
+import gtk
+from _gtk import gtk_set_locale
+
+gtk_set_locale ()
 
 import time
 #time.sleep(10)
@@ -21,7 +25,7 @@ def printlist(h, tag):
     
 
 db = rpm.opendb(0)
-rc = db.findbyname('glibc')
+rc = db.findbyname('kernel')
 h = db[rc[0]]
 
 rpm.addMacro("_i18ndomains", "redhat-dist");
@@ -29,6 +33,8 @@ rpm.addMacro("_i18ndomains", "redhat-dist");
 print h['summary']
 print h['description']
 print h['group']
+print h['version']
+print h['release']
 #print h['filenames']
 
 print h[rpm.RPMTAG_SUMMARY]
diff --git a/xf86config.py b/xf86config.py
index 10dd81bb9..d96952ac1 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -93,6 +93,21 @@ class XF86Config:
 
     def cards (self, thecard = None):
         cards = {}
+        # all the straight servers
+        cards["3DLabs"] = { "SERVER" : "3DLabs" }
+        cards["8514"]   = { "SERVER" : "8514" }
+        cards["FBDev"]  = { "SERVER" : "FBDev" } 
+        cards["I128"]   = { "SERVER" : "I128" }
+        cards["Mach8"]  = { "SERVER" : "Mach8" }
+        cards["Mach64"] = { "SERVER" : "Mach64" }
+        cards["Mach32"] = { "SERVER" : "Mach32" }
+        cards["Mono"]   = { "SERVER" : "Mono" }
+        cards["P9000"]  = { "SERVER" : "P9000" }
+        cards["S3"]     = { "SERVER" : "S3" }
+        cards["S3V"]    = { "SERVER" : "S3V" }
+        cards["SVGA"]   = { "SERVER" : "SVGA" }        
+        cards["W32"]    = { "SERVER" : "W32" }
+        
         db = open ('/usr/X11R6/lib/X11/Cards')
         lines = db.readlines ()
         db.close ()
@@ -810,8 +825,11 @@ Section "Device"
         info = { "DEVICE"  : self.devID,
                  "MONITOR" : monID }
 
+        maxdepth = -1
         for (depth, modes) in self.modes.items ():
             modes.sort (self.areaCompare)
+            if string.atoi(depth) > maxdepth:
+                maxdepth = string.atoi(depth)
         
         section = """
 # **********************************************************************
@@ -861,6 +879,8 @@ Section "Screen"
     Device      "%(DEVICE)s"
     Monitor     "%(MONITOR)s"
 """ % info
+                if maxdepth > 0:
+                    section = section + "    DefaultColorDepth %d\n" % maxdepth
                 for depth in self.modes.keys ():
                     if not self.modes[depth]: continue
                     section = section + """