[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 1f389c965004e9bcb557f7eb4c4e3fbd4e4ee926
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 6 00:11:47 2002 +0000

            Fixed 3043505.  Disallows drag drops on originating view.
    
            * WebView.subproj/WebView.m:
            (-[WebView draggingEntered:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1975 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c84ef4a..b5f4758 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-05  Richard Williamson (Local)  <rjw at apple.com>
+
+        Fixed 3043505.  Disallows drag drops on originating view.
+        
+        * WebView.subproj/WebView.m:
+        (-[WebView draggingEntered:]):
+
 2002-09-05  Darin Adler  <darin at apple.com>
 
 	Update to use the new style of assertions.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c84ef4a..b5f4758 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-05  Richard Williamson (Local)  <rjw at apple.com>
+
+        Fixed 3043505.  Disallows drag drops on originating view.
+        
+        * WebView.subproj/WebView.m:
+        (-[WebView draggingEntered:]):
+
 2002-09-05  Darin Adler  <darin at apple.com>
 
 	Update to use the new style of assertions.
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 59677f4..2269875 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -142,7 +142,11 @@ enum {
 
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
 {
-    return [self _web_dragOperationForDraggingInfo:sender];
+    if([sender draggingSource] != [self documentView] && [self _web_bestURLForDraggingInfo:sender]) {
+        return NSDragOperationCopy;
+    } else {
+        return NSDragOperationNone;
+    }
 }
 
 - (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender

-- 
WebKit Debian packaging