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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 0ff0f70f83d775fa791969d3727f2a8892d42449
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 15 19:51:21 2002 +0000

            Added text color to attributed string conversion.
    
            * kwq/WebCoreBridge.mm:
            (attributedString):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a205e41..d065e69 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-10-15  Richard Williamson  <rjw at apple.com>
 
+        Added text color to attributed string conversion.
+        
+        * kwq/WebCoreBridge.mm:
+        (attributedString):
+
+2002-10-15  Richard Williamson  <rjw at apple.com>
+
         Added API to get attributed string from bridge.
         Added API to get selection in terms of the DOM API
         from the bridge.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a205e41..d065e69 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-10-15  Richard Williamson  <rjw at apple.com>
 
+        Added text color to attributed string conversion.
+        
+        * kwq/WebCoreBridge.mm:
+        (attributedString):
+
+2002-10-15  Richard Williamson  <rjw at apple.com>
+
         Added API to get attributed string from bridge.
         Added API to get selection in terms of the DOM API
         from the bridge.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a205e41..d065e69 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-10-15  Richard Williamson  <rjw at apple.com>
 
+        Added text color to attributed string conversion.
+        
+        * kwq/WebCoreBridge.mm:
+        (attributedString):
+
+2002-10-15  Richard Williamson  <rjw at apple.com>
+
         Added API to get attributed string from bridge.
         Added API to get selection in terms of the DOM API
         from the bridge.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 7948b10..1cbe784 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -599,7 +599,7 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
                 text = str;
                 
             if (font)
-                partialString = [[NSAttributedString alloc] initWithString: text.getNSString() attributes: [NSDictionary dictionaryWithObjectsAndKeys: font, NSFontAttributeName, NSForegroundColorAttributeName, color, 0]];
+                partialString = [[NSAttributedString alloc] initWithString: text.getNSString() attributes: [NSDictionary dictionaryWithObjectsAndKeys: font, NSFontAttributeName, color, NSForegroundColorAttributeName, 0]];
             else
                 partialString = [[NSAttributedString alloc] initWithString: text.getNSString() attributes: nil];
                 

-- 
WebKit Debian packaging