Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 18:50:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filtering plugins from old installation down to three as per decision in 23856, r=amusil

Browse Source
This commit is contained in:
av%netscape.com 2000-06-21 01:44:55 +00:00
parent f74e55bdcb
commit 569653202b
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -2636,6 +2636,25 @@ static PRBool isJavaPlugin(nsPluginTag * tag)
return (nsnull == PL_strncasecmp(filename, "npjava", 6));
}
// currently 'unwanted' plugins are Java, and all other plugins except
// RealPlayer, Acrobat, Flash
static PRBool isUnwantedPlugin(nsPluginTag * tag)
{
if(tag->mFileName == nsnull)
return PR_TRUE;
if(nsnull == PL_strncasecmp(tag->mMimeType, "audio/x-pn-realaudio-plugin", PL_strlen(tag->mMimeType)))
return PR_FALSE;
if(nsnull == PL_strncasecmp(tag->mMimeType, "application/pdf", PL_strlen(tag->mMimeType)))
return PR_FALSE;
if(nsnull == PL_strncasecmp(tag->mMimeType, "application/x-shockwave-flash", PL_strlen(tag->mMimeType)))
return PR_FALSE;
return PR_TRUE;
}
NS_IMETHODIMP nsPluginHostImpl::LoadPlugins()
{
// currently we decided to look in both local plugins dir and
@ -2718,7 +2737,8 @@ NS_IMETHODIMP nsPluginHostImpl::LoadPlugins()
PRBool bAddIt = PR_TRUE;
// make sure we ignore 4.x Java plugins no matter what
if(isJavaPlugin(pluginTag))
// and other unwanted plugins as per temporary decision described in #23856
if(isUnwantedPlugin(pluginTag))
bAddIt = PR_FALSE;
else
{

22
modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@ -2636,6 +2636,25 @@ static PRBool isJavaPlugin(nsPluginTag * tag)
return (nsnull == PL_strncasecmp(filename, "npjava", 6));
}
// currently 'unwanted' plugins are Java, and all other plugins except
// RealPlayer, Acrobat, Flash
static PRBool isUnwantedPlugin(nsPluginTag * tag)
{
if(tag->mFileName == nsnull)
return PR_TRUE;
if(nsnull == PL_strncasecmp(tag->mMimeType, "audio/x-pn-realaudio-plugin", PL_strlen(tag->mMimeType)))
return PR_FALSE;
if(nsnull == PL_strncasecmp(tag->mMimeType, "application/pdf", PL_strlen(tag->mMimeType)))
return PR_FALSE;
if(nsnull == PL_strncasecmp(tag->mMimeType, "application/x-shockwave-flash", PL_strlen(tag->mMimeType)))
return PR_FALSE;
return PR_TRUE;
}
NS_IMETHODIMP nsPluginHostImpl::LoadPlugins()
{
// currently we decided to look in both local plugins dir and
@ -2718,7 +2737,8 @@ NS_IMETHODIMP nsPluginHostImpl::LoadPlugins()
PRBool bAddIt = PR_TRUE;
// make sure we ignore 4.x Java plugins no matter what
if(isJavaPlugin(pluginTag))
// and other unwanted plugins as per temporary decision described in #23856
if(isUnwantedPlugin(pluginTag))
bAddIt = PR_FALSE;
else
{