Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ugly thunderbird hack. Has no effect on seamonkey builds.

Browse Source 
When launching the app via Launch Task (which is the case when starting up for the first time), check to see if the cmd line service
has any arguments (such as mailto urls). If so pass these arguments into OpenWindow instead of using the handler's default arguments.

This fixes the problem where clicking on a mailto url in a browser when thunderbird was NOT already running, caused a blank
compose window where the mailto url was ignored.


git-svn-id: svn://10.0.0.236/trunk@144769 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2003-07-12 04:12:14 +00:00
parent 3bf13f145f
commit 96edd8050e
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/xpfe/appshell/src/nsAppShellService.cpp
View File

@@ -1114,10 +1114,34 @@ nsAppShellService::LaunchTask(const char *aParam, PRInt32 height, PRInt32 width,
PRBool handlesArgs = PR_FALSE;
rv = handler->GetHandlesArgs(&handlesArgs);
if (handlesArgs) {
#ifndef MOZ_THUNDERBIRD
nsXPIDLString defaultArgs;
rv = handler->GetDefaultArgs(getter_Copies(defaultArgs));
if (NS_FAILED(rv)) return rv;
rv = OpenWindow(chromeUrlForTask, defaultArgs, SIZE_TO_CONTENT, SIZE_TO_CONTENT);
#else
// XXX horibble thunderbird hack. Don't pass in the default args if the cmd line service
// says we have real arguments! Use those instead.
nsXPIDLCString args;
nsXPIDLCString cmdLineArgument; // -mail, -compose, etc.
rv = handler->GetCommandLineArgument(getter_Copies(cmdLineArgument));
if (NS_SUCCEEDED(rv)) {
rv = cmdLine->GetCmdLineValue(cmdLineArgument, getter_Copies(args));
if (NS_SUCCEEDED(rv) && args.get()) {
nsAutoString cmdArgs; cmdArgs.AssignWithConversion(args);
rv = OpenWindow(chromeUrlForTask, cmdArgs, height, width);
}
}
// any failure case, do what we used to do:
if (NS_FAILED(rv)) {
nsXPIDLString defaultArgs;
rv = handler->GetDefaultArgs(getter_Copies(defaultArgs));
if (NS_FAILED(rv)) return rv;
rv = OpenWindow(chromeUrlForTask, defaultArgs, SIZE_TO_CONTENT, SIZE_TO_CONTENT);
}
#endif
}
else {
rv = OpenWindow(chromeUrlForTask, nsString(), width, height);
@@ -1233,10 +1257,11 @@ nsAppShellService::Ensure1Window(nsICmdLineService *aCmdLineService)
#ifdef MOZ_THUNDERBIRD
PRBool windowOpened = PR_FALSE;
rv = LaunchTask(NULL, height, width, &windowOpened);
if (NS_FAILED(rv) || !windowOpened)
rv = LaunchTask("mail", height, width, &windowOpened);
#else
rv = OpenBrowserWindow(height, width);
#endif