[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 1b1e48347ee5a76e6c57c9e3b473267d585d6543
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 23 05:48:50 2002 +0000

    	load and unload is only a WebNetscapePluginPackage thing since you can't unload an NSBundle.
    
            * Plugins.subproj/WebBasePluginPackage.h:
            * Plugins.subproj/WebBasePluginPackage.m:
            * Plugins.subproj/WebNetscapePluginPackage.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2429 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b17103e..85ae3d9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-10-22  Chris Blumenberg  <cblu at apple.com>
 
+	load and unload is only a WebNetscapePluginPackage thing since you can't unload an NSBundle.
+
+        * Plugins.subproj/WebBasePluginPackage.h:
+        * Plugins.subproj/WebBasePluginPackage.m:
+        * Plugins.subproj/WebNetscapePluginPackage.h:
+
+2002-10-22  Chris Blumenberg  <cblu at apple.com>
+
 	More moving stuff around for the new plug-in API. Added WebBasePluginPackage and added subclass WebPluginPackage. Also made WebNetscapePluginPackage a subclass of WebBasePluginPackage. 
 
         * Plugins.subproj/WebBasePluginPackage.h: Added.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b17103e..85ae3d9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-10-22  Chris Blumenberg  <cblu at apple.com>
 
+	load and unload is only a WebNetscapePluginPackage thing since you can't unload an NSBundle.
+
+        * Plugins.subproj/WebBasePluginPackage.h:
+        * Plugins.subproj/WebBasePluginPackage.m:
+        * Plugins.subproj/WebNetscapePluginPackage.h:
+
+2002-10-22  Chris Blumenberg  <cblu at apple.com>
+
 	More moving stuff around for the new plug-in API. Added WebBasePluginPackage and added subclass WebPluginPackage. Also made WebNetscapePluginPackage a subclass of WebBasePluginPackage. 
 
         * Plugins.subproj/WebBasePluginPackage.h: Added.
diff --git a/WebKit/Plugins.subproj/WebBasePluginPackage.h b/WebKit/Plugins.subproj/WebBasePluginPackage.h
index e572cc4..f5259ab 100644
--- a/WebKit/Plugins.subproj/WebBasePluginPackage.h
+++ b/WebKit/Plugins.subproj/WebBasePluginPackage.h
@@ -20,8 +20,6 @@
     NSString *path;
     NSString *filename;
     NSString *pluginDescription;
-
-    BOOL isLoaded;
 }
 
 + (WebBasePluginPackage *)pluginWithPath:(NSString *)pluginPath;
@@ -36,8 +34,4 @@
 - (NSDictionary *)MIMEToExtensionsDictionary;
 - (NSDictionary *)MIMEToDescriptionDictionary;
 
-- (BOOL)load;
-- (void)unload;
-- (BOOL)isLoaded;
-
 @end
diff --git a/WebKit/Plugins.subproj/WebBasePluginPackage.m b/WebKit/Plugins.subproj/WebBasePluginPackage.m
index 6bc2413..3455673 100644
--- a/WebKit/Plugins.subproj/WebBasePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebBasePluginPackage.m
@@ -61,26 +61,10 @@
     return MIMEToDescription;
 }
 
-- (BOOL)load
-{
-    // Overriden by subclasses.
-    return NO;
-}
-
-- (void)unload
-{
-    // Overriden by subclasses.
-}
-
-- (BOOL)isLoaded
-{
-    return isLoaded;
-}
-
 - (NSString *)description
 {
-    return [NSString stringWithFormat:@"name: %@\npath: %@\nisLoaded: %d\nmimeTypes:\n%@\npluginDescription:%@",
-        name, path, isLoaded, [MIMEToExtensions description], [MIMEToDescription description], pluginDescription];
+    return [NSString stringWithFormat:@"name: %@\npath: %@\nmimeTypes:\n%@\npluginDescription:%@",
+        name, path, [MIMEToExtensions description], [MIMEToDescription description], pluginDescription];
 }
 
 @end
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.h b/WebKit/Plugins.subproj/WebNetscapePluginPackage.h
index 7660717..66f2602 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.h
@@ -15,6 +15,7 @@
 {
     BOOL isBundle;
     BOOL isCFM;
+    BOOL isLoaded;
     
     NPPluginFuncs pluginFuncs;
     NPNetscapeFuncs browserFuncs;
@@ -44,6 +45,9 @@
     NPP_ShutdownProcPtr NPP_Shutdown;
 }
 
+- (BOOL)load;
+- (void)unload;
+
 - (NPP_NewProcPtr)NPP_New;
 - (NPP_DestroyProcPtr)NPP_Destroy;
 - (NPP_SetWindowProcPtr)NPP_SetWindow;

-- 
WebKit Debian packaging