standard 640x480 for monitors we don't probe

2 files changed, 22 insertions, 2 deletions

diff --git a/iw/xconfig.py b/iw/xconfig.py
index 439343ce3..28890c165 100644
--- a/iw/xconfig.py
+++ b/iw/xconfig.py
@@ -37,6 +37,15 @@ class XCustomWindow (InstallWindow):
         self.todo.x.modes = newmodes
         
     def testPressed (self, widget, *args):
+        newmodes = {}
+
+        for depth in self.toggles.keys ():
+            newmodes[depth] = []
+            for (res, button) in self.toggles[depth]:
+                if button.get_active ():
+                    newmodes[depth].append (res)
+
+        self.todo.x.modes = newmodes
         try:
             self.todo.x.test ()
         except RuntimeError:
@@ -169,7 +178,7 @@ class XConfigWindow (InstallWindow):
         self.autoBox.pack_start (result, FALSE)
 
         self.monlist = None
-        if self.todo.x.monID == "My Monitor":
+        if self.todo.x.monID == "Generic Monitor":
             label = GtkLabel (_("Your monitor could not be "
                                 "autodetected. Please choose it "
                                 "from the list below:"))
diff --git a/xf86config.py b/xf86config.py
index f73765e18..2d2141d8b 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -446,7 +446,7 @@ EndSection
         if self.monEisa:
             info["EISA"] = self.monEisa
         else:
-            info["EISA"] = "My Monitor"
+            info["EISA"] = "Generic Monitor"
 
         self.monID = info["EISA"]
 
@@ -467,6 +467,17 @@ EndSection
 
 # Any number of monitor sections may be present
 Section "Monitor"
+    Identifier  "Generic Monitor"
+    VendorName  "Unknown"
+    ModelName   "Unknown"
+    HorizSync   31.5
+    VertRefresh 60
+    Mode "640x480"        25.175  640 664 760 800
+                                  480 491 493 525
+    EndMode
+EndSection
+
+Section "Monitor"
 
     Identifier  "%(EISA)s"
     VendorName  "Unknown"