From 64d4a2e2a22ccc1c6221e98d1f8fc375db8670e4 Mon Sep 17 00:00:00 2001 From: "bnesse%netscape.com" Date: Fri, 8 Jun 2001 20:45:07 +0000 Subject: [PATCH] Fix for bug 51507. Remove "Netscape" from warning dialog. r=timeless, sr=slecf,a=dbaron. --- modules/libpref/src/prefapi.c | 11 ++++++++--- modules/libpref/src/prefapi.cpp | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/libpref/src/prefapi.c b/modules/libpref/src/prefapi.c index 60b889e8081c..c80aab450c5f 100644 --- a/modules/libpref/src/prefapi.c +++ b/modules/libpref/src/prefapi.c @@ -1946,7 +1946,12 @@ pref_ErrorReporter(JSContext *cx, const char *message, last = PR_sprintf_append(0, "An error occurred reading the startup configuration file. " "Please contact your administrator."); +#if defined(XP_MAC) + // StandardAlert doesn't handle linefeeds. Use spaces to avoid garbage characters. + last = PR_sprintf_append(last, " "); +#else last = PR_sprintf_append(last, LINEBREAK LINEBREAK); +#endif if (!report) last = PR_sprintf_append(last, "%s\n", message); else @@ -1990,7 +1995,7 @@ void pref_Alert(char* msg) SInt16 itemHit; pmsg[0] = PL_strlen(msg); BlockMoveData(msg, pmsg + 1, pmsg[0]); - StandardAlert(kAlertPlainAlert, "\pNetscape -- JS Preference Warning", pmsg, NULL, &itemHit); + StandardAlert(kAlertPlainAlert, "\pConfiguration Warning", pmsg, NULL, &itemHit); } #else @@ -2005,9 +2010,9 @@ void pref_Alert(char* msg) fputs(msg, stderr); #endif #if defined(XP_WIN) - MessageBox (NULL, msg, "Netscape -- JS Preference Warning", MB_OK); + MessageBox (NULL, msg, "Configuration Warning", MB_OK); #elif defined(XP_OS2) - WinMessageBox (HWND_DESKTOP, 0, msg, "Netscape -- JS Preference Warning", 0, MB_WARNING | MB_OK | MB_APPLMODAL | MB_MOVEABLE); + WinMessageBox (HWND_DESKTOP, 0, msg, "Configuration Warning", 0, MB_WARNING | MB_OK | MB_APPLMODAL | MB_MOVEABLE); #endif } diff --git a/modules/libpref/src/prefapi.cpp b/modules/libpref/src/prefapi.cpp index 60b889e8081c..c80aab450c5f 100644 --- a/modules/libpref/src/prefapi.cpp +++ b/modules/libpref/src/prefapi.cpp @@ -1946,7 +1946,12 @@ pref_ErrorReporter(JSContext *cx, const char *message, last = PR_sprintf_append(0, "An error occurred reading the startup configuration file. " "Please contact your administrator."); +#if defined(XP_MAC) + // StandardAlert doesn't handle linefeeds. Use spaces to avoid garbage characters. + last = PR_sprintf_append(last, " "); +#else last = PR_sprintf_append(last, LINEBREAK LINEBREAK); +#endif if (!report) last = PR_sprintf_append(last, "%s\n", message); else @@ -1990,7 +1995,7 @@ void pref_Alert(char* msg) SInt16 itemHit; pmsg[0] = PL_strlen(msg); BlockMoveData(msg, pmsg + 1, pmsg[0]); - StandardAlert(kAlertPlainAlert, "\pNetscape -- JS Preference Warning", pmsg, NULL, &itemHit); + StandardAlert(kAlertPlainAlert, "\pConfiguration Warning", pmsg, NULL, &itemHit); } #else @@ -2005,9 +2010,9 @@ void pref_Alert(char* msg) fputs(msg, stderr); #endif #if defined(XP_WIN) - MessageBox (NULL, msg, "Netscape -- JS Preference Warning", MB_OK); + MessageBox (NULL, msg, "Configuration Warning", MB_OK); #elif defined(XP_OS2) - WinMessageBox (HWND_DESKTOP, 0, msg, "Netscape -- JS Preference Warning", 0, MB_WARNING | MB_OK | MB_APPLMODAL | MB_MOVEABLE); + WinMessageBox (HWND_DESKTOP, 0, msg, "Configuration Warning", 0, MB_WARNING | MB_OK | MB_APPLMODAL | MB_MOVEABLE); #endif }