From 521c9d6d710cdbf5bed202fe19f6f47c0edbc7ce Mon Sep 17 00:00:00 2001
From: "peterlubczynski%netscape.com" <peterlubczynski%netscape.com>
Date: Wed, 21 Mar 2001 01:47:37 +0000
Subject: [PATCH] Null plugin registered twice. bug 67933 a=av r=attinasi

---
 modules/plugin/base/src/nsPluginHostImpl.cpp | 2 ++
 modules/plugin/nglsrc/nsPluginHostImpl.cpp   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp
index a4891c0c404d..03b09fb0be73 100644
--- a/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -3490,10 +3490,12 @@ NS_IMETHODIMP nsPluginHostImpl::LoadPlugins()
                          lpath, 
                          PR_TRUE);  // check for specific plugins
   }
+#endif
 
   mPluginsLoaded = PR_TRUE; // at this point 'some' plugins have been loaded,
                             // the rest is optional
  
+#ifdef XP_WIN
   // Check the windows registry for extra paths to scan for plugins
   //
   // We are going to get this registry key location from the pref:
diff --git a/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index a4891c0c404d..03b09fb0be73 100644
--- a/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -3490,10 +3490,12 @@ NS_IMETHODIMP nsPluginHostImpl::LoadPlugins()
                          lpath, 
                          PR_TRUE);  // check for specific plugins
   }
+#endif
 
   mPluginsLoaded = PR_TRUE; // at this point 'some' plugins have been loaded,
                             // the rest is optional
  
+#ifdef XP_WIN
   // Check the windows registry for extra paths to scan for plugins
   //
   // We are going to get this registry key location from the pref: