[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 a331ab1f6b0f40bb5e219d44a999ede9d6a1a817
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 11 17:53:29 2001 +0000

    Added default for pluginsEnabled
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@486 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index fb0a8aa..4c6e174 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2001-12-11  Chris Blumenberg  <cblu at apple.com>
+
+	* ChangeLog:
+	* src/kwq/KWQKHTMLPart.mm:
+
+2001-12-11  Chris Blumenberg  <set EMAIL_ADDRESS environment variable>
+
+	* src/kwq/KWQKHTMLPart.mm:
+
 2001-12-10  Kenneth Kocienda  <kocienda at apple.com>
 
         Went back and did a better job of cleaning up the warnings
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fb0a8aa..4c6e174 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2001-12-11  Chris Blumenberg  <cblu at apple.com>
+
+	* ChangeLog:
+	* src/kwq/KWQKHTMLPart.mm:
+
+2001-12-11  Chris Blumenberg  <set EMAIL_ADDRESS environment variable>
+
+	* src/kwq/KWQKHTMLPart.mm:
+
 2001-12-10  Kenneth Kocienda  <kocienda at apple.com>
 
         Went back and did a better job of cleaning up the warnings
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fb0a8aa..4c6e174 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2001-12-11  Chris Blumenberg  <cblu at apple.com>
+
+	* ChangeLog:
+	* src/kwq/KWQKHTMLPart.mm:
+
+2001-12-11  Chris Blumenberg  <set EMAIL_ADDRESS environment variable>
+
+	* src/kwq/KWQKHTMLPart.mm:
+
 2001-12-10  Kenneth Kocienda  <kocienda at apple.com>
 
         Went back and did a better job of cleaning up the warnings
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 3ba0d46..a2fe076 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -396,8 +396,7 @@ void KHTMLPart::setPluginsEnabled( bool enable )
 
 bool KHTMLPart::pluginsEnabled() const
 {
-    _logNeverImplemented();
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitPluginsEnabled"] boolValue];
 }
 
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 3ba0d46..a2fe076 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -396,8 +396,7 @@ void KHTMLPart::setPluginsEnabled( bool enable )
 
 bool KHTMLPart::pluginsEnabled() const
 {
-    _logNeverImplemented();
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitPluginsEnabled"] boolValue];
 }
 
 
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 3ba0d46..a2fe076 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -396,8 +396,7 @@ void KHTMLPart::setPluginsEnabled( bool enable )
 
 bool KHTMLPart::pluginsEnabled() const
 {
-    _logNeverImplemented();
-    return FALSE;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitPluginsEnabled"] boolValue];
 }
 
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 88d180a..9a81eb4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-11  Chris Blumenberg  <cblu at apple.com>
+
+	* ChangeLog:
+	* WebView.subproj/NSWebPageDataSource.mm: (+[NSWebPageDataSource initialize]):
+
+2001-12-11  Chris Blumenberg  <set EMAIL_ADDRESS environment variable>
+
+	* WebView.subproj/NSWebPageDataSource.mm: (+[NSWebPageDataSource initialize]):
+
 2001-12-10  John Sullivan  <sullivan at apple.com>
 
 	* WebView.subproj/WKWebController.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 88d180a..9a81eb4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2001-12-11  Chris Blumenberg  <cblu at apple.com>
+
+	* ChangeLog:
+	* WebView.subproj/NSWebPageDataSource.mm: (+[NSWebPageDataSource initialize]):
+
+2001-12-11  Chris Blumenberg  <set EMAIL_ADDRESS environment variable>
+
+	* WebView.subproj/NSWebPageDataSource.mm: (+[NSWebPageDataSource initialize]):
+
 2001-12-10  John Sullivan  <sullivan at apple.com>
 
 	* WebView.subproj/WKWebController.h:
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/NSWebPageDataSource.mm
index 5577a48..0bae512 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/NSWebPageDataSource.mm
@@ -10,6 +10,7 @@
     NSAutoreleasePool *localPool;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSArray *fontSizeArray = [NSArray arrayWithObjects:@"7", @"8", @"9", @"10", @"12", @"13", @"14", @"16", nil];
+    NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
     
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
 //        @"0xffffffff", 		@"WebKitLogLevel",
@@ -22,6 +23,7 @@
         @"Times-Roman", 	@"WebKitFantasyFont",
         @"6", 			@"WebKitMinimumFontSize",
         fontSizeArray,		@"WebKitFontSizes",
+        pluginsEnabled,		@"WebKitPluginsEnabled",
         nil];
 
     [defaults registerDefaults:dict];

-- 
WebKit Debian packaging