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

Moving part of fix for #81659 from 0.9.2 branch. Now recognize non-bundle OS X plugins of type 'IEPL' (e.g. Apple's iTools plugin). Also moved test for OS X plugin types inside an #if TARGET_CARBON.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@99867 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sdagley%netscape.com
2001-07-25 02:45:10 +00:00
parent b2c6408669
commit c90632a81a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp
View File

@@ -140,10 +140,14 @@ PRBool nsPluginsDir::IsPluginFile(const nsFileSpec& fileSpec)
const FSSpec& spec = fileSpec;
OSErr result = FSpGetFInfo(&spec, &info);
if (result == noErr && ((info.fdType == 'shlb' && info.fdCreator == 'MOSS') ||
info.fdType == 'NSPL' || info.fdType == 'BRPL'))
info.fdType == 'NSPL'))
return PR_TRUE;
#if TARGET_CARBON
// Some additional plugin types for Carbon/Mac OS X
if (result == noErr && (info.fdType == 'BRPL' || info.fdType == 'IEPL'))
return PR_TRUE;
// for Mac OS X bundles.
CFBundleRef bundle = getPluginBundle(spec);
if (bundle) {

6
mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp
View File

@@ -140,10 +140,14 @@ PRBool nsPluginsDir::IsPluginFile(const nsFileSpec& fileSpec)
const FSSpec& spec = fileSpec;
OSErr result = FSpGetFInfo(&spec, &info);
if (result == noErr && ((info.fdType == 'shlb' && info.fdCreator == 'MOSS') ||
info.fdType == 'NSPL' || info.fdType == 'BRPL'))
info.fdType == 'NSPL'))
return PR_TRUE;
#if TARGET_CARBON
// Some additional plugin types for Carbon/Mac OS X
if (result == noErr && (info.fdType == 'BRPL' || info.fdType == 'IEPL'))
return PR_TRUE;
// for Mac OS X bundles.
CFBundleRef bundle = getPluginBundle(spec);
if (bundle) {