[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 5ddec8bdfee007cd3b8339cea294947115f19601
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 29 22:54:17 2003 +0000

    WebKit:
    
    	Fixed: 3151216 - Safari crashes on Drag&Drop if plugin dialog is open
    
            Reviewed by rjw.
    
            * Misc.subproj/WebNSViewExtras.m:
            (-[NSView _web_dragOperationForDraggingInfo:]): return NSDragOperationNone is the app has a modal window so the current page can't be changed with a drag
            * WebView.subproj/WebView.m:
            (-[WebView draggingEntered:]): return _web_dragOperationForDraggingInfo
    
    WebBrowser:
    
    	Fixed: 3151216 - Safari crashes on Drag&Drop if plugin dialog is open
    
            Reviewed by rjw.
    
            * BrowserApplication.m:
            (-[BrowserApplication beginModalSessionForWindow:]): disable dragging app-wide
            (-[BrowserApplication endModalSession:]): renable dragging app-wide
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2e17f58..d6aec92 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-05-29  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: 3151216 - Safari crashes on Drag&Drop if plugin dialog is open
+	
+        Reviewed by rjw.
+
+        * Misc.subproj/WebNSViewExtras.m:
+        (-[NSView _web_dragOperationForDraggingInfo:]): return NSDragOperationNone is the app has a modal window so the current page can't be changed with a drag
+        * WebView.subproj/WebView.m:
+        (-[WebView draggingEntered:]): return _web_dragOperationForDraggingInfo
+
+2003-05-29  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: 3273109 - leak from functionPointerForTVector in -[WebNetscapePluginPackage load]
 
         * Plugins.subproj/WebNetscapePluginPackage.m:
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index dd93601..f8891ef 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -133,7 +133,7 @@
 
 - (NSDragOperation)_web_dragOperationForDraggingInfo:(id <NSDraggingInfo>)sender
 {
-    if([sender draggingSource] != self && [[sender draggingPasteboard] _web_bestURL]) {
+    if ([sender draggingSource] != self && ![NSApp modalWindow] && [[sender draggingPasteboard] _web_bestURL]) {
         return NSDragOperationCopy;
     } else {
         return NSDragOperationNone;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 5b335d9..a295e5b 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -531,11 +531,7 @@ NS_ENDHANDLER
 
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
 {
-    if([[sender draggingPasteboard] _web_bestURL]){
-        return NSDragOperationCopy;
-    }
-
-    return NSDragOperationNone;
+    return [self _web_dragOperationForDraggingInfo:sender];
 }
 
 - (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender

-- 
WebKit Debian packaging