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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 9dbb97436123c76d5ad85ffd5d9d03b326e947cc
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 15 22:48:02 2004 +0000

    	3695240 - pasting plain text with newlines in it turns them into spaces
    
    	Easy fix, we just need to consume the incoming data as text instead of markup.
    
            Reviewed by John and Darin.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView _documentFragmentFromPasteboard:allowPlainText:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 62dcf2b..6161c7c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-15  Trey Matteson  <trey at apple.com>
+
+	3695240 - pasting plain text with newlines in it turns them into spaces
+
+	Easy fix, we just need to consume the incoming data as text instead of markup.
+
+        Reviewed by John and Darin.
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView _documentFragmentFromPasteboard:allowPlainText:]):
+
 2004-06-15  Darin Adler  <darin at apple.com>
 
         - fixed crash introduced by my earlier change
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 7629e5d..b7faeee 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -255,11 +255,11 @@ static WebElementOrTextFilter *elementOrTextFilterInstance = nil;
     } else if ([types containsObject:NSRTFDPboardType]) {
         // FIXME: Support RTFD to HTML (or DOM) conversion.
         ERROR("RTFD to HTML conversion not yet supported.");
-        return [[self _bridge] documentFragmentWithMarkupString:[pasteboard stringForType:NSStringPboardType] baseURLString:nil];
+        return [[self _bridge] documentFragmentWithText:[pasteboard stringForType:NSStringPboardType]];
     } else if ([types containsObject:NSRTFPboardType]) {
         // FIXME: Support RTF to HTML (or DOM) conversion.
         ERROR("RTF to HTML conversion not yet supported.");
-        return [[self _bridge] documentFragmentWithMarkupString:[pasteboard stringForType:NSStringPboardType] baseURLString:nil];
+        return [[self _bridge] documentFragmentWithText:[pasteboard stringForType:NSStringPboardType]];
     } else if (allowPlainText && [types containsObject:NSStringPboardType]) {
         return [[self _bridge] documentFragmentWithText:[pasteboard stringForType:NSStringPboardType]];
     }

-- 
WebKit Debian packaging