[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 35712009b8244838d1d9e1e55fde309b3dd87a8b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 12 23:28:52 2002 +0000

    WebKit:
    
    	Only accept drags of 1 file.
    
            * WebView.subproj/IFWebView.mm:
            (-[IFWebView draggingEntered:]):
    
    WebBrowser:
    
    	Only accept drags of 1 file.
    
            * LocationFieldEditor.m:
            (-[LocationFieldEditor _dragOperationForDraggingInfo:]): added
            (-[LocationFieldEditor draggingEntered:]): returns _dragOperationForDraggingInfo
            (-[LocationFieldEditor draggingUpdated:]): returns _dragOperationForDraggingInfo
            (-[LocationFieldEditor concludeDragOperation:]): removed comment
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1548 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ac487a8..459bff1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-12  Chris Blumenberg  <cblu at apple.com>
+
+	Only accept drags of 1 file.
+
+        * WebView.subproj/IFWebView.mm:
+        (-[IFWebView draggingEntered:]):
+
 2002-07-12  Darin Adler  <darin at apple.com>
 
 	Fix cancelling. My recent check-in broke it for downloads.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ac487a8..459bff1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-07-12  Chris Blumenberg  <cblu at apple.com>
+
+	Only accept drags of 1 file.
+
+        * WebView.subproj/IFWebView.mm:
+        (-[IFWebView draggingEntered:]):
+
 2002-07-12  Darin Adler  <darin at apple.com>
 
 	Fix cancelling. My recent check-in broke it for downloads.
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 3eaf28b..d875b8c 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -120,11 +120,9 @@ enum {
     dragType = [[sender draggingPasteboard] availableTypeFromArray:_private->draggingTypes];
     if([dragType isEqualToString:@"NSFilenamesPboardType"]){
         files = [[sender draggingPasteboard] propertyListForType:@"NSFilenamesPboardType"];
-        
-        // FIXME: We only look at the first dragged file (2931225)
         file = [files objectAtIndex:0];
         
-        if([IFWebController canShowFile:file])
+        if([files count] == 1 && [IFWebController canShowFile:file])
             return NSDragOperationCopy;
             
     }else if([dragType isEqualToString:@"NSURLPboardType"]){
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 3eaf28b..d875b8c 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -120,11 +120,9 @@ enum {
     dragType = [[sender draggingPasteboard] availableTypeFromArray:_private->draggingTypes];
     if([dragType isEqualToString:@"NSFilenamesPboardType"]){
         files = [[sender draggingPasteboard] propertyListForType:@"NSFilenamesPboardType"];
-        
-        // FIXME: We only look at the first dragged file (2931225)
         file = [files objectAtIndex:0];
         
-        if([IFWebController canShowFile:file])
+        if([files count] == 1 && [IFWebController canShowFile:file])
             return NSDragOperationCopy;
             
     }else if([dragType isEqualToString:@"NSURLPboardType"]){

-- 
WebKit Debian packaging