зеркало из https://github.com/mozilla/pjs.git
fix spelling of hander to handler. bug #29407. r=sspitzer
This commit is contained in:
Родитель
8fcd2d03da
Коммит
8bbac10e64
|
@ -67,12 +67,12 @@ static nsModuleComponentInfo components[] = {
|
|||
{ "Editor Service", NS_EDITORSERVICE_CID,
|
||||
"component://netscape/editor/editorservice", nsEditorServiceConstructor,},
|
||||
{ "Editor Startup Handler", NS_EDITORSERVICE_CID,
|
||||
"component://netscape/commandlinehander/general-startup-editor",
|
||||
"component://netscape/commandlinehandler/general-startup-editor",
|
||||
nsEditorServiceConstructor,
|
||||
nsEditorService::RegisterProc,
|
||||
nsEditorService::UnregisterProc, },
|
||||
{ "Edit Startup Handler", NS_EDITORSERVICE_CID,
|
||||
"component://netscape/commandlinehander/general-startup-edit",
|
||||
"component://netscape/commandlinehandler/general-startup-edit",
|
||||
nsEditorServiceConstructor, },
|
||||
};
|
||||
|
||||
|
|
|
@ -38,4 +38,4 @@ NS_IMPL_QUERY_INTERFACE2(nsEditorService,
|
|||
nsIEditorService,
|
||||
nsICmdLineHandler)
|
||||
|
||||
CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/","Start with editor.","component://netscape/commandlinehander/general-startup-editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE)
|
||||
CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/","Start with editor.","component://netscape/commandlinehandler/general-startup-editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE)
|
||||
|
|
|
@ -38,4 +38,4 @@ NS_IMPL_QUERY_INTERFACE2(nsEditorService,
|
|||
nsIEditorService,
|
||||
nsICmdLineHandler)
|
||||
|
||||
CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/","Start with editor.","component://netscape/commandlinehander/general-startup-editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE)
|
||||
CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/","Start with editor.","component://netscape/commandlinehandler/general-startup-editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE)
|
||||
|
|
|
@ -67,12 +67,12 @@ static nsModuleComponentInfo components[] = {
|
|||
{ "Editor Service", NS_EDITORSERVICE_CID,
|
||||
"component://netscape/editor/editorservice", nsEditorServiceConstructor,},
|
||||
{ "Editor Startup Handler", NS_EDITORSERVICE_CID,
|
||||
"component://netscape/commandlinehander/general-startup-editor",
|
||||
"component://netscape/commandlinehandler/general-startup-editor",
|
||||
nsEditorServiceConstructor,
|
||||
nsEditorService::RegisterProc,
|
||||
nsEditorService::UnregisterProc, },
|
||||
{ "Edit Startup Handler", NS_EDITORSERVICE_CID,
|
||||
"component://netscape/commandlinehander/general-startup-edit",
|
||||
"component://netscape/commandlinehandler/general-startup-edit",
|
||||
nsEditorServiceConstructor, },
|
||||
};
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
"component://netscape/addressbook"
|
||||
|
||||
#define NS_ADDRESSBOOKSTARTUPHANDLER_PROGID \
|
||||
"component://netscape/commandlinehander/general-startup-addressbook"
|
||||
"component://netscape/commandlinehandler/general-startup-addressbook"
|
||||
|
||||
#define NS_ADDRESSBOOK_CID \
|
||||
{ /* {D60B84F2-2A8C-11d3-9E07-00A0C92B5F0D} */ \
|
||||
|
|
|
@ -236,7 +236,7 @@
|
|||
#define NS_MESSENGERBOOTSTRAP_PROGID \
|
||||
"component://netscape/appshell/component/messenger"
|
||||
#define NS_MAILSTARTUPHANDLER_PROGID \
|
||||
"component://netscape/commandlinehander/general-startup-mail"
|
||||
"component://netscape/commandlinehandler/general-startup-mail"
|
||||
|
||||
//
|
||||
// nsMessenger
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#define NS_MSGCOMPOSESERVICE_PROGID \
|
||||
"component://netscape/messengercompose"
|
||||
#define NS_MSGCOMPOSESTARTUPHANDLER_PROGID \
|
||||
"component://netscape/commandlinehander/general-startup-compose"
|
||||
"component://netscape/commandlinehandler/general-startup-compose"
|
||||
|
||||
//
|
||||
// nsMsgCompose
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
#define NS_NNTPSERVICE_PROGID \
|
||||
"component://netscape/messenger/nntpservice"
|
||||
#define NS_NEWSSTARTUPHANDLER_PROGID \
|
||||
"component://netscape/commandlinehander/general-startup-news"
|
||||
"component://netscape/commandlinehandler/general-startup-news"
|
||||
|
||||
#define NS_NNTPSERVICE_CID \
|
||||
{ /* 4C9F90E1-E19B-11d2-806E-006008128C4E */ \
|
||||
|
|
|
@ -244,7 +244,7 @@ static void DumpArbitraryHelp()
|
|||
progid->ToString (getter_Copies(progidString));
|
||||
|
||||
#ifdef DEBUG_CMD_LINE
|
||||
printf("cmd line hander progid = %s\n", (const char *)progidString);
|
||||
printf("cmd line handler progid = %s\n", (const char *)progidString);
|
||||
#endif /* DEBUG_CMD_LINE */
|
||||
|
||||
nsCOMPtr <nsICmdLineHandler> handler = do_GetService((const char *)progidString, &rv);
|
||||
|
@ -418,8 +418,8 @@ void startupPrefEnumerationFunction(const char *prefName, void *data)
|
|||
if (PL_strlen(prefName) <= prefixLen) return;
|
||||
|
||||
if (prefValue) {
|
||||
// this is the progid prefix that all the command line handers register
|
||||
nsCAutoString progID = "component://netscape/commandlinehander/general-startup-";
|
||||
// this is the progid prefix that all the command line handlers register
|
||||
nsCAutoString progID = "component://netscape/commandlinehandler/general-startup-";
|
||||
progID += (prefName + prefixLen);
|
||||
|
||||
#ifdef DEBUG_CMD_LINE
|
||||
|
@ -497,7 +497,7 @@ static nsresult HandleArbitraryStartup( nsICmdLineService* cmdLineArgs, nsIPref
|
|||
printf("XXX argv[%d] = %s\n",i,argv[i]);
|
||||
#endif /* DEBUG_CMD_LINE */
|
||||
if (IsStartupCommand(argv[i])) {
|
||||
nsCAutoString progID = "component://netscape/commandlinehander/general-startup-";
|
||||
nsCAutoString progID = "component://netscape/commandlinehandler/general-startup-";
|
||||
|
||||
// skip over the - (or / on windows)
|
||||
char *command = argv[i] + 1;
|
||||
|
@ -797,7 +797,7 @@ void DumpHelp(char *appname)
|
|||
printf("%s-nosplash%sDisable splash screen.\n",HELP_SPACER_1,HELP_SPACER_2);
|
||||
#endif
|
||||
|
||||
// this works, but only after the components have registered. so if you drop in a new command line hander, -help
|
||||
// this works, but only after the components have registered. so if you drop in a new command line handler, -help
|
||||
// won't not until the second run.
|
||||
// out of the bug, because we ship a component.reg file, it works correctly.
|
||||
DumpArbitraryHelp();
|
||||
|
|
|
@ -77,7 +77,7 @@ interface nsIBrowserInstance : nsISupports {
|
|||
%{C++
|
||||
|
||||
#define NS_BROWSERINSTANCE_PROGID "component://netscape/appshell/component/browser/instance"
|
||||
#define NS_BROWSERSTARTUPHANDLER_PROGID "component://netscape/commandlinehander/general-startup-browser"
|
||||
#define NS_BROWSERSTARTUPHANDLER_PROGID "component://netscape/commandlinehandler/general-startup-browser"
|
||||
|
||||
// {c7bee75a-1dd1-11b2-9333-a38e085287cf}
|
||||
#define NS_BROWSERCONTROLLER_CID { 0xc7bee75a, 0x1dd1, 0x11b2, { 0x93, 0x33, 0xa3, 0x8e, 0x08, 0x52, 0x87, 0xcf } }
|
||||
|
|
|
@ -254,7 +254,7 @@ function Shutdown()
|
|||
/* START OF UNNECESSARY CODE */
|
||||
if ( !explicitURL ) {
|
||||
try {
|
||||
var handler = Components.classes['component://netscape/commandlinehander/general-startup-browser'];
|
||||
var handler = Components.classes['component://netscape/commandlinehandler/general-startup-browser'];
|
||||
handler = handler.getService();
|
||||
handler = handler.QueryInterface(Components.interfaces.nsICmdLineHandler);
|
||||
if (handler) {
|
||||
|
|
|
@ -2660,7 +2660,7 @@ static nsModuleComponentInfo components[] = {
|
|||
},
|
||||
{ "Chrome Startup Handler",
|
||||
NS_BROWSERCONTENTHANDLER_CID,
|
||||
"component://netscape/commandlinehander/general-startup-chrome",
|
||||
"component://netscape/commandlinehandler/general-startup-chrome",
|
||||
nsBrowserContentHandlerConstructor,
|
||||
}
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ function toOpenWindowByType( inType, uri )
|
|||
function OpenBrowserWindow()
|
||||
{
|
||||
dump("In OpenBrowserWindw()...\n");
|
||||
var handler = Components.classes['component://netscape/commandlinehander/general-startup-browser'];
|
||||
var handler = Components.classes['component://netscape/commandlinehandler/general-startup-browser'];
|
||||
handler = handler.getService();
|
||||
handler = handler.QueryInterface(Components.interfaces.nsICmdLineHandler);
|
||||
var startpage = handler.defaultArgs;
|
||||
|
|
Загрузка…
Ссылка в новой задаче