зеркало из https://github.com/mozilla/gecko-dev.git
Bug 261567 print XPI stub opening error in UI instead of console
patch by ajschult@verizon.net r=bsmedberg sr=dveditz
This commit is contained in:
Родитель
bb90509990
Коммит
bf57384387
|
@ -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
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче