[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit a3d0d0026b10c6ec54953a5e37fb1aeff014fed4
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 1 00:37:51 2002 +0000

    	Changed font preferences wiring so that we're actually setting WebKit defaults
    	where they exist. Unfortunately this doesn't change the displayed font, due
    	to a familyname-vs-fontname discrepancy that we'll have to work out a solution
    	for.
    
    	Made the "Empty Cache" and "Clear History" buttons in Storage Preferences work.
    
    	* Defaults.plist:
    	* PreferenceKeys.h: changed and added some default strings.
    
    	* Preferences.subproj/StoragePreferences.m:
    	(-[StoragePreferences historyDiskUseString]),
    	(-[StoragePreferences cacheDiskUseString]): Stop returning a pretend string,
    	return "<unknknown>" instead.
    	(-[StoragePreferences clearCache:]): Implement using IFURLLoadManager
    	(-[StoragePreferences clearHistory:]): Implement using IFWebHistory
    
    	* Preferences.subproj/TextPreferences.h:
    	* Preferences.subproj/TextPreferences.m:
    	(-[TextPreferences changeFont:]),
    	(-[TextPreferences takeStandardFontChoiceFrom:]),
    	(-[TextPreferences initializeFromDefaults]):
    	Wire up "default font" choice and use new WebKit-style keys where appropriate
    
        * Preferences.subproj/TextPreferences.nib: Wired up the default font menu.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 2ea9bdd..a17086c 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -21,12 +21,12 @@
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
 //        @"0xffffffff", 		@"WebKitLogLevel",
         @"0x0", 		@"WebKitLogLevel",
-        @"Times-Roman", 	@"WebKitStandardFont",
-        @"Courier",  		@"WebKitFixedFont",
-        @"Times-Roman", 	@"WebKitSerifFont",
-        @"Arial", 		@"WebKitSansSerifFont", 
-        @"Times-Roman", 	@"WebKitCursiveFont",
-        @"Times-Roman", 	@"WebKitFantasyFont",
+        @"ComicSansMS", 	@"WebKitStandardFont",
+        @"ComicSansMS",  		@"WebKitFixedFont",
+        @"ComicSansMS", 	@"WebKitSerifFont",
+        @"ComicSansMS", 		@"WebKitSansSerifFont", 
+        @"ComicSansMS", 	@"WebKitCursiveFont",
+        @"ComicSansMS", 	@"WebKitFantasyFont",
         @"6", 			@"WebKitMinimumFontSize",
         fontSizeArray,		@"WebKitFontSizes",
         pluginsEnabled,		@"WebKitPluginsEnabled",
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 2ea9bdd..a17086c 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -21,12 +21,12 @@
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
 //        @"0xffffffff", 		@"WebKitLogLevel",
         @"0x0", 		@"WebKitLogLevel",
-        @"Times-Roman", 	@"WebKitStandardFont",
-        @"Courier",  		@"WebKitFixedFont",
-        @"Times-Roman", 	@"WebKitSerifFont",
-        @"Arial", 		@"WebKitSansSerifFont", 
-        @"Times-Roman", 	@"WebKitCursiveFont",
-        @"Times-Roman", 	@"WebKitFantasyFont",
+        @"ComicSansMS", 	@"WebKitStandardFont",
+        @"ComicSansMS",  		@"WebKitFixedFont",
+        @"ComicSansMS", 	@"WebKitSerifFont",
+        @"ComicSansMS", 		@"WebKitSansSerifFont", 
+        @"ComicSansMS", 	@"WebKitCursiveFont",
+        @"ComicSansMS", 	@"WebKitFantasyFont",
         @"6", 			@"WebKitMinimumFontSize",
         fontSizeArray,		@"WebKitFontSizes",
         pluginsEnabled,		@"WebKitPluginsEnabled",

-- 
WebKit Debian packaging