[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 224c147ee10d397268a96bd46135a172dcedcee2
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 12 01:13:56 2003 +0000

    	Fixed: <rdar://problem/3289577>: Reenable Carbon Java plug-ins when in Carbon app
    
            Reviewed by gramps.
    
            * Plugins.subproj/WebPluginDatabase.m:
            (-[WebPluginDatabase pluginForKey:withEnumeratorSelector:]): only call canUsePlugin: for web plug-ins
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4527 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 68ee842..f9343b9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,7 +1,17 @@
 2003-06-11  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3289577>: Reenable Carbon Java plug-ins when in Carbon app
+
+        Reviewed by gramps.
+
+        * Plugins.subproj/WebPluginDatabase.m:
+        (-[WebPluginDatabase pluginForKey:withEnumeratorSelector:]): only call canUsePlugin: for web plug-ins
+
+2003-06-11  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3289380>: REGRESSION: policyDataSource == nil assertion failure after closing particular window
 
+
         Reviewed by john.
 
         * WebView.subproj/WebFramePrivate.m:
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index ecc127c..cede613 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -126,9 +126,9 @@ static BOOL sIsCocoa = FALSE;
 
     if ([self canUsePlugin:webPlugin]) {
         return webPlugin;
-    } else if ([self canUsePlugin:machoPlugin]) {
+    } else if (machoPlugin) {
         return machoPlugin;
-    } else if ([self canUsePlugin:CFMPlugin]) {
+    } else if (CFMPlugin) {
         return CFMPlugin;
     } else {
         return nil;

-- 
WebKit Debian packaging