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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit cddc623c2244177b0b00b82c1a1005113dc363e8
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 4 16:12:37 2004 +0000

            Fixed crasher from last checkin.
    
            Reviewed by Ken.
    
            * Plugins.subproj/WebPluginDatabase.m:
            (+[WebPluginDatabase setAdditionalWebPlugInPaths:]):
            (pluginLocations):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6762 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9b24d73..a55d7ba 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-04  Richard Williamson   <rjw at apple.com>
+
+        Fixed crasher from last checkin.
+        
+        Reviewed by Ken.
+
+        * Plugins.subproj/WebPluginDatabase.m:
+        (+[WebPluginDatabase setAdditionalWebPlugInPaths:]):
+        (pluginLocations):
+
 2004-06-03  Richard Williamson   <rjw at apple.com>
 
 		Add SPI to allow setting of plugin load path.
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 2753b26..7d4d2f5 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -177,9 +177,10 @@ static NSArray *extensionPlugInPaths;
 
 + (void)setAdditionalWebPlugInPaths:(NSArray *)a
 {
-    if (a != extensionPlugInPaths)
+    if (a != extensionPlugInPaths) {
         [extensionPlugInPaths release];
-    extensionPlugInPaths = [a copyWithZone:nil];
+        extensionPlugInPaths = [a copyWithZone:nil];
+    }
 }
 
 
@@ -196,11 +197,11 @@ static NSArray *pluginLocations(void)
         [array addObjectsFromArray:extensionPlugInPaths];
     }
     
-    return [array addObjectsFromArray: [NSArray arrayWithObjects:
-        [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Internet Plug-Ins"],
-    	@"/Library/Internet Plug-Ins",
-    	[[NSBundle mainBundle] builtInPlugInsPath],
-        nil]];
+    [array addObject:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Internet Plug-Ins"]];
+    [array addObject:@"/Library/Internet Plug-Ins"];
+    [array addObject:[[NSBundle mainBundle] builtInPlugInsPath]];
+        
+    return array;
 }
 
 - init

-- 
WebKit Debian packaging