[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 2007d7d5b0a8ee7689c3f4206d0e58ea9ccd3b96
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 29 15:19:16 2002 +0000

    WebKit:
    
    	Fixed:
    	2971845 - text view uses default "user font" (Helvetica), not fonts chosen in Alexander preferences
    
            * WebView.subproj/WebTextView.m:
            (-[WebTextView initWithFrame:]): add observer
            (-[WebTextView dealloc]): remove observer
            (-[WebTextView setFixedWidthFont]): added, checks defaults
            (-[WebTextView dataSourceUpdated:]): calls setFixedWidthFont
            (-[WebTextView searchFor:direction:caseSensitive:]): no changes
            (-[WebTextView defaultsChanged:]): calls setFixedWidthFont
    
    WebBrowser:
    
    	Fixed:
    	3006975 - Typing in address field should replace favicon with generic
    	3009771 - Bookmark title for dragged icon from location field is sometimes incorrect
    	3009755 - Dragged icon from location field needs to include title
    
            * BrowserWindowController.m:
            (-[BrowserWindowController bookmarkTitleForLocationField:]): use pageName
            * FavoriteButton.h:
            * FavoriteButton.m:
            (-[FavoriteButton imageForDraggingFromEvent:]): made public
            (-[FavoriteButton mouseDown:]): use imageForDraggingFromEvent
            * LocationTextField.h:
            * LocationTextField.m:
            (-[LocationTextField dealloc]): release cached icon and string
            (-[LocationTextField _setIcon:save:]): added, caches icon
            (-[LocationTextField setIcon:]): calls _setIcon:save:
            (-[LocationTextField mouseDown:]): calls imageForDraggingFromEvent
            (-[LocationTextField setStringValue:]): caches string
            (-[LocationTextField textDidChange:]): sets generic icon
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d994c4d..aaf21a0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-07-29  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed:
+	2971845 - text view uses default "user font" (Helvetica), not fonts chosen in Alexander preferences
+
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView initWithFrame:]): add observer
+        (-[WebTextView dealloc]): remove observer
+        (-[WebTextView setFixedWidthFont]): added, checks defaults
+        (-[WebTextView dataSourceUpdated:]): calls setFixedWidthFont
+        (-[WebTextView searchFor:direction:caseSensitive:]): no changes
+        (-[WebTextView defaultsChanged:]): calls setFixedWidthFont
+
 2002-07-27  Chris Blumenberg  <cblu at apple.com>
 
 	Implemented click policy, support for option-click
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d994c4d..aaf21a0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-07-29  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed:
+	2971845 - text view uses default "user font" (Helvetica), not fonts chosen in Alexander preferences
+
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView initWithFrame:]): add observer
+        (-[WebTextView dealloc]): remove observer
+        (-[WebTextView setFixedWidthFont]): added, checks defaults
+        (-[WebTextView dataSourceUpdated:]): calls setFixedWidthFont
+        (-[WebTextView searchFor:direction:caseSensitive:]): no changes
+        (-[WebTextView defaultsChanged:]): calls setFixedWidthFont
+
 2002-07-27  Chris Blumenberg  <cblu at apple.com>
 
 	Implemented click policy, support for option-click
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index fcf26b1..3cc9629 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -6,6 +6,7 @@
 #import <WebKit/WebTextView.h>
 
 #import <WebKit/WebDataSource.h>
+#import <WebKit/WebPreferences.h>
 
 @interface NSString (NSStringTextFinding)
 
@@ -55,10 +56,27 @@
         [[self textContainer] setWidthTracksTextView:YES];
         [self setAutoresizingMask:NSViewWidthSizable];
         [self setEditable:NO];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(defaultsChanged:)
+                                                     name:NSUserDefaultsDidChangeNotification
+                                                   object:nil];
     }
     return self;
 }
 
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [super dealloc];
+}
+
+- (void)setFixedWidthFont
+{
+    WebPreferences *preferences = [WebPreferences standardPreferences];
+    NSFont *font = [NSFont fontWithName:[preferences fixedFontFamily] size:[preferences defaultFontSize]];
+    [self setFont:font];
+}
+
 - (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
 {
 }
@@ -78,7 +96,7 @@
         [self replaceCharactersInRange:NSMakeRange(0,0) withRTF:[dataSource data]];
     } else {
         [self setRichText:NO];
-        
+        [self setFixedWidthFont];
         // FIXME: This needs to use the correct encoding, but the list of names of encodings
         // is currently inside WebCore where we can't share it.
         string = [[NSString alloc] initWithData:[dataSource data] encoding:NSASCIIStringEncoding];
@@ -142,4 +160,11 @@
     return lastFindWasSuccessful;
 }
 
+- (void)defaultsChanged:(NSNotification *)notification
+{
+    if(![self isRichText]){
+        [self setFixedWidthFont];
+    }
+}
+
 @end

-- 
WebKit Debian packaging