[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 3a7f4528bb8865d8f807df65dc7651ed4e4a9d96
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 27 01:27:29 2002 +0000

    Added a defaults key for enabling Java. Off by default for now.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@673 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 3191e74..779f09c 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -535,8 +535,7 @@ void KHTMLPart::setJavaEnabled( bool enable )
 
 bool KHTMLPart::javaEnabled() const
 {
-    _logNotYetImplemented();
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
 }
 
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 3191e74..779f09c 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -535,8 +535,7 @@ void KHTMLPart::setJavaEnabled( bool enable )
 
 bool KHTMLPart::javaEnabled() const
 {
-    _logNotYetImplemented();
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
 }
 
 
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 3191e74..779f09c 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -535,8 +535,7 @@ void KHTMLPart::setJavaEnabled( bool enable )
 
 bool KHTMLPart::javaEnabled() const
 {
-    _logNotYetImplemented();
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitJavaEnabled"] boolValue];
 }
 
 
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index f33bccb..2ea9bdd 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -16,11 +16,12 @@
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSArray *fontSizeArray = [NSArray arrayWithObjects:@"7", @"8", @"9", @"10", @"12", @"13", @"14", @"16", nil];
     NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
+    NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
     
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
 //        @"0xffffffff", 		@"WebKitLogLevel",
         @"0x0", 		@"WebKitLogLevel",
-        @"Times-Roman", 		@"WebKitStandardFont",
+        @"Times-Roman", 	@"WebKitStandardFont",
         @"Courier",  		@"WebKitFixedFont",
         @"Times-Roman", 	@"WebKitSerifFont",
         @"Arial", 		@"WebKitSansSerifFont", 
@@ -29,6 +30,7 @@
         @"6", 			@"WebKitMinimumFontSize",
         fontSizeArray,		@"WebKitFontSizes",
         pluginsEnabled,		@"WebKitPluginsEnabled",
+        javaEnabled,		@"WebKitJavaEnabled",
         nil];
 
     [defaults registerDefaults:dict];
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index f33bccb..2ea9bdd 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -16,11 +16,12 @@
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSArray *fontSizeArray = [NSArray arrayWithObjects:@"7", @"8", @"9", @"10", @"12", @"13", @"14", @"16", nil];
     NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
+    NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
     
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
 //        @"0xffffffff", 		@"WebKitLogLevel",
         @"0x0", 		@"WebKitLogLevel",
-        @"Times-Roman", 		@"WebKitStandardFont",
+        @"Times-Roman", 	@"WebKitStandardFont",
         @"Courier",  		@"WebKitFixedFont",
         @"Times-Roman", 	@"WebKitSerifFont",
         @"Arial", 		@"WebKitSansSerifFont", 
@@ -29,6 +30,7 @@
         @"6", 			@"WebKitMinimumFontSize",
         fontSizeArray,		@"WebKitFontSizes",
         pluginsEnabled,		@"WebKitPluginsEnabled",
+        javaEnabled,		@"WebKitJavaEnabled",
         nil];
 
     [defaults registerDefaults:dict];

-- 
WebKit Debian packaging