[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 42ba8a59a0582eeb1758238787113f406f48ca6e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 3 22:15:57 2003 +0000

    	Fixed: <rdar://problem/3206011>: Don't accepts drags when showing dialogs or sheets
    
            Reviewed by john.
    
            * Misc.subproj/WebNSViewExtras.m:
            (-[NSView _web_dragOperationForDraggingInfo:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4589 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 67becdf..3daf884 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2003-07-03  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3206011>: Don't accepts drags when showing dialogs or sheets
+
+        Reviewed by john.
+
+        * Misc.subproj/WebNSViewExtras.m:
+        (-[NSView _web_dragOperationForDraggingInfo:]):
+
+2003-07-03  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3291566>: Aborting standalone image load makes image directory page unusable
 
         Reviewed by john.
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index e74cd8c..4d25005 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -136,7 +136,10 @@
 
 - (NSDragOperation)_web_dragOperationForDraggingInfo:(id <NSDraggingInfo>)sender
 {
-    if ([sender draggingSource] != self && ![NSApp modalWindow] && [[sender draggingPasteboard] _web_bestURL]) {
+    if (![NSApp modalWindow] && 
+        ![[self window] attachedSheet] &&
+        [sender draggingSource] != self &&
+        [[sender draggingPasteboard] _web_bestURL]) {
         return NSDragOperationCopy;
     } else {
         return NSDragOperationNone;

-- 
WebKit Debian packaging