[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 4b0afd68bb99a9d6fb20cfa3e74b16a5ba6335a2
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 00:39:58 2004 +0000

    	Fixed a typo.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView concludeDragOperation:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6167 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 997bb25..cd84681 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2004-03-03  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed a typo.
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView concludeDragOperation:]):
+
+2004-03-03  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3576070>: REGRESSION: web view won't accept drag of webloc file
 
         Reviewed by rjw.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index b65dd2d..580c5b8 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1650,8 +1650,8 @@ static WebHTMLView *lastHitView = nil;
 
 - (void)concludeDragOperation:(id <NSDraggingInfo>)sender
 {
-    NSDictionary *element = [self _elementAtPoint:[self convertPoint:[sender draggingLocation] fromView:nil]];
-    if ([[element objectForKey:WebElementIsEditableKey] boolValue]) {
+    NSPoint point = [self convertPoint:[sender draggingLocation] fromView:nil];
+    if ([[[self _elementAtPoint:point] objectForKey:WebElementIsEditableKey] boolValue] && [[self _bridge] moveCaretToPoint:point]) {
         // FIXME: We should delete the original selection if we're doing a move.
         [self _pasteHTMLFromPasteboard:[sender draggingPasteboard]];
     } else {

-- 
WebKit Debian packaging