[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 f0ed4c0dbf355c66388444ee6067371f5137e0dd
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 2 21:37:51 2001 +0000

    Enabled user defaults for KWQKHTMLSettings
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@403 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index ade5168..a9dd1dc 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -51,37 +51,43 @@ KHTMLSettings::KHTMLSettings()
 
 QString KHTMLSettings::stdFontName() const
 {
-    return QString ("Arial");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"stdFontName"]);
 }
 
 
 QString KHTMLSettings::fixedFontName() const
 {
-    return QString ("Courier");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"fixedFontName"]);
 }
 
 
 QString KHTMLSettings::serifFontName() const
 {
-    return QString ("Times-Roman");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"serifFontName"]);
 }
 
 
 QString KHTMLSettings::sansSerifFontName() const
 {
-    return QString ("Arial");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"sansSerifFontName"]);
 }
 
 
 QString KHTMLSettings::cursiveFontName() const
 {
-    return QString ("Times-Roman");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"cursiveFontName"]);
 }
 
 
 QString KHTMLSettings::fantasyFontName() const
 {
-    return QString ("Times-Roman");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"fantasyFontName"]);
 }
 
 
diff --git a/WebCore/src/kwq/KWQKHTMLSettings.mm b/WebCore/src/kwq/KWQKHTMLSettings.mm
index ade5168..a9dd1dc 100644
--- a/WebCore/src/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/src/kwq/KWQKHTMLSettings.mm
@@ -51,37 +51,43 @@ KHTMLSettings::KHTMLSettings()
 
 QString KHTMLSettings::stdFontName() const
 {
-    return QString ("Arial");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"stdFontName"]);
 }
 
 
 QString KHTMLSettings::fixedFontName() const
 {
-    return QString ("Courier");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"fixedFontName"]);
 }
 
 
 QString KHTMLSettings::serifFontName() const
 {
-    return QString ("Times-Roman");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"serifFontName"]);
 }
 
 
 QString KHTMLSettings::sansSerifFontName() const
 {
-    return QString ("Arial");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"sansSerifFontName"]);
 }
 
 
 QString KHTMLSettings::cursiveFontName() const
 {
-    return QString ("Times-Roman");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"cursiveFontName"]);
 }
 
 
 QString KHTMLSettings::fantasyFontName() const
 {
-    return QString ("Times-Roman");
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    return NSSTRING_TO_QSTRING([defaults objectForKey:@"fantasyFontName"]);
 }
 
 
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/NSWebPageDataSource.mm
index 2c34c9c..7d378c6 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/NSWebPageDataSource.mm
@@ -4,4 +4,21 @@
 #import <WebKit/NSWebPageDataSource.h>
 
 @implementation NSWebPageDataSource
+
++ (void)initialize {
+
+    NSAutoreleasePool *localPool;
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
+        @"Arial", 		@"stdFontName",
+        @"Courier",  		@"fixedFontName",
+        @"Times-Roman", 	@"serifFontName",
+        @"Arial", 		@"sansSerifFontName", 
+        @"Times-Roman", 	@"cursiveFontName",
+        @"Times-Roman", 	@"fantasyFontName", nil];
+
+    [defaults registerDefaults:dict];
+
+}
+
 @end
diff --git a/WebKit/WebView.subproj/NSWebPageView.mm b/WebKit/WebView.subproj/NSWebPageView.mm
index cb4013d..2feb9bb 100644
--- a/WebKit/WebView.subproj/NSWebPageView.mm
+++ b/WebKit/WebView.subproj/NSWebPageView.mm
@@ -5,5 +5,4 @@
 
 @implementation NSWebPageView
 
-
 @end
\ No newline at end of file

-- 
WebKit Debian packaging