[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 98ff773032ce21cb3bbba5a1cd77f964cd727077
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 5 19:52:04 2002 +0000

    - Now passing DOCBASE to the Java plug-in
    - Enabled the Java preference
    - Made 'alex' Alexander's signature
    
    Modified Files:
    	WebBrowser/WebBrowser.pbproj/project.pbxproj
    	WebCore/src/kwq/KWQKHTMLPart.mm
    	WebCore/src/kwq/WCJavaAppletWidget.mm
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@692 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 92ecfee..ed7c246 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -545,8 +545,7 @@ void KHTMLPart::setJavaEnabled( bool enable )
 
 bool KHTMLPart::javaEnabled() const
 {
-    //return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
 }
 
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 92ecfee..ed7c246 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -545,8 +545,7 @@ void KHTMLPart::setJavaEnabled( bool enable )
 
 bool KHTMLPart::javaEnabled() const
 {
-    //return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
 }
 
 
diff --git a/WebCore/kwq/WCJavaAppletWidget.mm b/WebCore/kwq/WCJavaAppletWidget.mm
index 0ecf18f..fc9045d 100644
--- a/WebCore/kwq/WCJavaAppletWidget.mm
+++ b/WebCore/kwq/WCJavaAppletWidget.mm
@@ -32,18 +32,14 @@
 #include <kwqdebug.h>
 #include <WCPluginWidget.h>
 
- at interface IFPluginView : NSObject
-- initWithFrame: (NSRect) r plugin: (WCPlugin *)plug url: (NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
- at end
-
-WCIFPluginMakeFunc WCIFPluginMake;
 
 WCJavaAppletWidget::WCJavaAppletWidget(QMap<QString, QString> args)
 {
     NSMutableDictionary *arguments;
     WCPlugin *plugin;
     QMap<QString, QString>::Iterator it;
-
+    WCIFPluginMakeFunc WCIFPluginMake;
+    
     WCIFPluginMake = WCIFPluginMakeFunction();
 
     plugin = [[WCPluginDatabase installedPlugins] getPluginForFilename:@"Java.plugin"];
@@ -53,8 +49,10 @@ WCJavaAppletWidget::WCJavaAppletWidget(QMap<QString, QString> args)
     }
     
     arguments = [NSMutableDictionary dictionaryWithCapacity:10];
+    [arguments setObject:QSTRING_TO_NSSTRING(args["baseURL"]) forKey:@"DOCBASE"];
     for( it = args.begin(); it != args.end(); ++it ){
-        [arguments setObject:QSTRING_TO_NSSTRING(it.data()) forKey:QSTRING_TO_NSSTRING(it.key())];
+        if(it.key() != "baseURL")
+            [arguments setObject:QSTRING_TO_NSSTRING(it.data()) forKey:QSTRING_TO_NSSTRING(it.key())];
     }
     setView(WCIFPluginMake(NSMakeRect(0,0,0,0), plugin, nil, @"application/x-java-applet", arguments, NP_EMBED));
 }
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 92ecfee..ed7c246 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -545,8 +545,7 @@ void KHTMLPart::setJavaEnabled( bool enable )
 
 bool KHTMLPart::javaEnabled() const
 {
-    //return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
 }
 
 
diff --git a/WebCore/src/kwq/WCJavaAppletWidget.mm b/WebCore/src/kwq/WCJavaAppletWidget.mm
index 0ecf18f..fc9045d 100644
--- a/WebCore/src/kwq/WCJavaAppletWidget.mm
+++ b/WebCore/src/kwq/WCJavaAppletWidget.mm
@@ -32,18 +32,14 @@
 #include <kwqdebug.h>
 #include <WCPluginWidget.h>
 
- at interface IFPluginView : NSObject
-- initWithFrame: (NSRect) r plugin: (WCPlugin *)plug url: (NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
- at end
-
-WCIFPluginMakeFunc WCIFPluginMake;
 
 WCJavaAppletWidget::WCJavaAppletWidget(QMap<QString, QString> args)
 {
     NSMutableDictionary *arguments;
     WCPlugin *plugin;
     QMap<QString, QString>::Iterator it;
-
+    WCIFPluginMakeFunc WCIFPluginMake;
+    
     WCIFPluginMake = WCIFPluginMakeFunction();
 
     plugin = [[WCPluginDatabase installedPlugins] getPluginForFilename:@"Java.plugin"];
@@ -53,8 +49,10 @@ WCJavaAppletWidget::WCJavaAppletWidget(QMap<QString, QString> args)
     }
     
     arguments = [NSMutableDictionary dictionaryWithCapacity:10];
+    [arguments setObject:QSTRING_TO_NSSTRING(args["baseURL"]) forKey:@"DOCBASE"];
     for( it = args.begin(); it != args.end(); ++it ){
-        [arguments setObject:QSTRING_TO_NSSTRING(it.data()) forKey:QSTRING_TO_NSSTRING(it.key())];
+        if(it.key() != "baseURL")
+            [arguments setObject:QSTRING_TO_NSSTRING(it.data()) forKey:QSTRING_TO_NSSTRING(it.key())];
     }
     setView(WCIFPluginMake(NSMakeRect(0,0,0,0), plugin, nil, @"application/x-java-applet", arguments, NP_EMBED));
 }

-- 
WebKit Debian packaging