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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 79af2f58a4e5533c8a3cfe2eb93e510be6a65e9a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 1 20:57:57 2004 +0000

            Reviewed by Darin
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView _fontManagerOperationAsStyle]): Fixed typo in family-name code that caused
            family names to match when they should not.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6735 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e4a0261..89c7263 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,6 +1,14 @@
+2004-06-01  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView _fontManagerOperationAsStyle]): Fixed typo in family-name code that caused
+        family names to match when they should not.
+
 2004-06-01  Chris Blumenberg  <cblu at apple.com>
 
-	Made paste and drop ask the delegate before making any replacements.
+        Made paste and drop ask the delegate before making any replacements.
 
         Reviewed by kocienda.
 
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 2112c37..8845b25 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -2371,7 +2371,7 @@ static WebHTMLView *lastHitView = nil;
     NSFont *b = [fm convertFont:[fm fontWithFamily:@"Times" traits:(NSBoldFontMask | NSItalicFontMask) weight:10 size:12]];
     
     NSString *fa = [a familyName];
-    NSString *fb = [a familyName];
+    NSString *fb = [b familyName];
     if ([fa isEqualToString:fb]) {
         [style setFontFamily:fa];
     }

-- 
WebKit Debian packaging