From c90632a81a236f8a6cfdb52296fe88f34f77c19e Mon Sep 17 00:00:00 2001 From: "sdagley%netscape.com" Date: Wed, 25 Jul 2001 02:45:10 +0000 Subject: [PATCH] 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. git-svn-id: svn://10.0.0.236/trunk@99867 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp | 6 +++++- mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp b/mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp index 4b772865303..8181701bbaa 100644 --- a/mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginsDirMac.cpp @@ -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) { diff --git a/mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp b/mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp index 4b772865303..8181701bbaa 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginsDirMac.cpp @@ -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) {