From 2cb9bbea6b2b13f094e9b6c3ebd545f9040df324 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org"
 <timeless%mozdev.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 29 Sep 2004 01:06:25 +0000
Subject: [PATCH] Bug 261567 print XPI stub opening error in UI instead of
 console patch by ajschult@verizon.net r=bsmedberg sr=dveditz

git-svn-id: svn://10.0.0.236/trunk@162926 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../xpinstall/wizard/unix/src2/installer.ini  |  2 +-
 .../xpinstall/wizard/unix/src2/nsXIEngine.cpp |  2 +-
 .../wizard/unix/src2/nsXInstaller.cpp         | 22 +++++++------------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/mozilla/xpinstall/wizard/unix/src2/installer.ini b/mozilla/xpinstall/wizard/unix/src2/installer.ini
index c6732304928..f87a536f325 100644
--- a/mozilla/xpinstall/wizard/unix/src2/installer.ini
+++ b/mozilla/xpinstall/wizard/unix/src2/installer.ini
@@ -74,7 +74,7 @@ UNKNOWN=Unknown
 -615=Download failed
 -616=Extraction of XPCOM failed
 -617=Failed to fork a process
--618=Couldn't open xpistub library
+-618=Couldn't open xpistub library: %s
 -619=Couldn't get symbol in library
 -620=A xpistub call failed
 -621=An Installer module %s (.xpi) failed to install
diff --git a/mozilla/xpinstall/wizard/unix/src2/nsXIEngine.cpp b/mozilla/xpinstall/wizard/unix/src2/nsXIEngine.cpp
index eb7d821af05..66c746dcbd1 100644
--- a/mozilla/xpinstall/wizard/unix/src2/nsXIEngine.cpp
+++ b/mozilla/xpinstall/wizard/unix/src2/nsXIEngine.cpp
@@ -648,7 +648,7 @@ printf("DEBUG: libpath = >>%s<<\n", libpath);
     {
         dlerr = dlerror();
         DUMP(dlerr);
-        fprintf(stderr,"DLError: %s",dlerr);
+        ErrorHandler(E_LIB_OPEN, dlerr);
         return E_LIB_OPEN;
     }
     DUMP("xpistub opened");
diff --git a/mozilla/xpinstall/wizard/unix/src2/nsXInstaller.cpp b/mozilla/xpinstall/wizard/unix/src2/nsXInstaller.cpp
index 6f452eb06d8..f6f05005ad9 100644
--- a/mozilla/xpinstall/wizard/unix/src2/nsXInstaller.cpp
+++ b/mozilla/xpinstall/wizard/unix/src2/nsXInstaller.cpp
@@ -419,21 +419,15 @@ ErrorHandler(int aErr, const char* aErrMsg)
     char errStr[16];
     
     sprintf(errStr, "%d", aErr); 
-    if (!IsErrFatal(aErr))
-    {
-	if(aErr == E_INSTALL)
-	{
-	    if (aErrMsg != NULL)
-	    {
-		sprintf(newmsg, gCtx->Res(errStr), aErrMsg);
-		sprintf(msg, gCtx->Res("ERROR"), aErr, newmsg);
-	    }
-	}
-	else
-	    sprintf(msg, gCtx->Res("ERROR"), aErr, gCtx->Res(errStr));
-    }
+    if (aErrMsg != NULL)
+       sprintf(newmsg, gCtx->Res(errStr), aErrMsg);
     else
-        sprintf(msg, gCtx->Res("FATAL_ERROR"), aErr, gCtx->Res(errStr));
+       strcpy(newmsg, gCtx->Res(errStr));
+
+    if (!IsErrFatal(aErr))
+        sprintf(msg, gCtx->Res("ERROR"), aErr, newmsg);
+    else
+        sprintf(msg, gCtx->Res("FATAL_ERROR"), aErr, newmsg);
     
     // lack of gCtx->window indicates we have not yet run RunWizard 
     // and gtk_init