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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit e2fbbd4085d8869903618d27e562d157b65c65ec
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 15 10:46:24 2002 +0000

    	Fix for 3128429, sans-serif font got broken.  Just a typo
    	from darin's mega-patch.
    
            Reviewed by mjs
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3059 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e3085be..69c43a3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-12-15  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3128429, sans-serif font got broken.  Just a typo
+	from darin's mega-patch.  
+	
+        Reviewed by mjs
+
+        * khtml/css/cssstyleselector.cpp:
+
 2002-12-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej and Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e3085be..69c43a3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-12-15  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3128429, sans-serif font got broken.  Just a typo
+	from darin's mega-patch.  
+	
+        Reviewed by mjs
+
+        * khtml/css/cssstyleselector.cpp:
+
 2002-12-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej and Dave.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index a7f4f24..0b0233c 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2594,7 +2594,7 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
                         fontDef.setGenericFamily(FontDef::eSerif);
                         break;
                     case FontDef::eSansSerif:
-                        face = settings->serifFontName();
+                        face = settings->sansSerifFontName();
                         fontDef.setGenericFamily(FontDef::eSansSerif);
                         break;
                     case FontDef::eCursive:

-- 
WebKit Debian packaging