[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 abf2e9e018cecd639d64022f42a2d61aeddc112c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 4 01:01:36 2004 +0000

    		Add SPI to allow setting of plugin load path.
    
            Reviewed by Hyatt.
    
            * Plugins.subproj/WebPluginDatabase.h:
            * Plugins.subproj/WebPluginDatabase.m:
            (+[WebPluginDatabase setAdditionalWebPlugInPaths:]):
            (pluginLocations):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9efa97c..9b24d73 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-03  Richard Williamson   <rjw at apple.com>
+
+		Add SPI to allow setting of plugin load path.
+		
+        Reviewed by Hyatt.
+
+        * Plugins.subproj/WebPluginDatabase.h:
+        * Plugins.subproj/WebPluginDatabase.m:
+        (+[WebPluginDatabase setAdditionalWebPlugInPaths:]):
+        (pluginLocations):
+
 2004-06-03  Darin Adler  <darin at apple.com>
 
         Reviewed by Chris.
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.h b/WebKit/Plugins.subproj/WebPluginDatabase.h
index c84126c..16d9480 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.h
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.h
@@ -26,3 +26,9 @@
 - (void)loadPluginIfNeededForMIMEType:(NSString *)MIMEType;
 
 @end
+
+ at interface NSObject (WebPlugInDatabase)
+
++ (void)setAdditionalWebPlugInPaths:(NSArray *)path;
+
+ at end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index f5dc2b4..2753b26 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -173,6 +173,16 @@ static BOOL sIsCocoa = FALSE;
     return [plugins allObjects];
 }
 
+static NSArray *extensionPlugInPaths;
+
++ (void)setAdditionalWebPlugInPaths:(NSArray *)a
+{
+    if (a != extensionPlugInPaths)
+        [extensionPlugInPaths release];
+    extensionPlugInPaths = [a copyWithZone:nil];
+}
+
+
 static NSArray *pluginLocations(void)
 {
     // Plug-ins are found in order of precedence.
@@ -180,12 +190,17 @@ static NSArray *pluginLocations(void)
     // For example, if there is a QuickTime.plugin in the users's home directory
     // that is used instead of the /Library/Internet Plug-ins version.
     // The purpose is to allow non-admin users to update their plug-ins.
+    NSMutableArray *array = [NSMutableArray arrayWithCapacity:[extensionPlugInPaths count] + 3];
+    
+    if (extensionPlugInPaths) {
+        [array addObjectsFromArray:extensionPlugInPaths];
+    }
     
-    return [NSArray arrayWithObjects:
+    return [array addObjectsFromArray: [NSArray arrayWithObjects:
         [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Internet Plug-Ins"],
     	@"/Library/Internet Plug-Ins",
     	[[NSBundle mainBundle] builtInPlugInsPath],
-        nil];
+        nil]];
 }
 
 - init

-- 
WebKit Debian packaging