Bug 82584; don't clear 'always ask me' flag based on Win32 registry setting; this will require the user to see the helper app dialog for confirmation to open at least one time and to specify that confirmation is not necessary directly to Mozilla; r=sgehani/sr=mscott/a=asa
git-svn-id: svn://10.0.0.236/trunk@97308 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
369a914ede
commit
0538f0f440
@ -237,8 +237,7 @@ nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformApp
|
||||
// value; the low order bit of the third byte of which indicates that the user does not need
|
||||
// to be prompted.
|
||||
//
|
||||
// This function sets only the Description and AlwaysAskBeforeHandling attributes of the
|
||||
// input nsIMIMEInfo.
|
||||
// This function sets only the Description attribute of the input nsIMIMEInfo.
|
||||
static nsresult GetMIMEInfoFromRegistry( LPBYTE fileType, nsIMIMEInfo *pInfo )
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
@ -259,22 +258,6 @@ static nsresult GetMIMEInfoFromRegistry( LPBYTE fileType, nsIMIMEInfo *pInfo )
|
||||
pInfo->SetDescription( desc.GetUnicode() );
|
||||
delete [] pDesc;
|
||||
}
|
||||
|
||||
// Now get EditFlags.
|
||||
DWORD len = 0;
|
||||
LPBYTE pEditFlags = GetValueBytes( fileTypeKey, "EditFlags", &len );
|
||||
if ( pEditFlags )
|
||||
{
|
||||
// Test "confirm open after download" setting. Note that this bit is
|
||||
// *on* if that checkbox is unchecked.
|
||||
if ( ( len >= 3 ) && ( pEditFlags[2] & 0x01 ) )
|
||||
{
|
||||
// This means we don't ask.
|
||||
pInfo->SetAlwaysAskBeforeHandling( PR_FALSE );
|
||||
}
|
||||
delete [] pEditFlags;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user