fix warning pixmap, unifiy exception text

3 files changed, 18 insertions, 16 deletions

diff --git a/anaconda b/anaconda
index d79f8907b..5e3dfcd99 100755
--- a/anaconda
+++ b/anaconda
@@ -449,6 +449,7 @@ if (display_mode == 'g'):
             if startXServer:
                 isys.vtActivate (1)
             print "GUI installer startup failed, falling back to text mode."
+            display_mode = 't'
             time.sleep(2)            
             from text import InstallInterface
 
@@ -484,7 +485,7 @@ if xmode:
 if display_mode == "t":
     intf = InstallInterface ()
 else:
-    intf = InstallInterface (runres = runres, nofbmode = nofbmode)
+    intf = InstallInterface (runres, nofbmode)
 
 # imports after setting up the path
 if method:
diff --git a/gui.py b/gui.py
index a9d58d6a0..8687eaa89 100755
--- a/gui.py
+++ b/gui.py
@@ -184,16 +184,16 @@ class ExceptionWindow:
         sw.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC)
 
         hbox = GtkHBox (FALSE)
-        s = None
-        if s:
-            hbox.pack_start (GnomePixmap (pixmap_file('gnome-warning.png')),
-                             FALSE)
-
-        info = GtkLabel (_("An exceptional condition has occured.  This "
-                           "is most likely a bug.  Please copy the "
-                           "full text of this exception and file a bug "
-                           "report against anaconda at "
-                           "http://bugzilla.redhat.com/bugzilla"))
+        file = pixmap_file('gnome-warning.png')
+        if file:
+            hbox.pack_start (GnomePixmap (file), FALSE)
+
+        info = GtkLabel(_("An unhandled exception has occured.  This "
+                          "is most likely a bug.  Please copy the "
+                          "full text of this exception or save the crash "
+                          "dump to a floppy then file a detailed bug "
+                          "report against anaconda at "
+                          "http://bugzilla.redhat.com/bugzilla/"))
         info.set_line_wrap (TRUE)
         info.set_usize (400, -1)
 
diff --git a/text.py b/text.py
index bfa44ebc9..1336831cc 100644
--- a/text.py
+++ b/text.py
@@ -246,11 +246,12 @@ class InstallInterface:
 	return 0
     
     def exceptionWindow(self, title, text):
-	ugh = _("An internal error occurred in the installation program. "
-		"Please report this error to Red Hat (through the "
-		"bugzilla.redhat.com web site) as soon as possible. The "
-		"information on this failure may be saved to a floppy disk, "
-		"and will help Red Hat in fixing the problem.\n\n")
+	ugh = "%s\n\n" % (_("An unhandled exception has occured.  This "
+                            "is most likely a bug.  Please copy the "
+                            "full text of this exception or save the crash "
+                            "dump to a floppy then file a detailed bug "
+                            "report against anaconda at "
+                            "http://bugzilla.redhat.com/bugzilla/"),)
 
 	rc = ButtonChoiceWindow(self.screen, title, ugh + text,
                            buttons=[TEXT_OK_BUTTON, _("Save"), _("Debug")])