[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 9332bfebf8a0968b1eba90bdf9bddc22eeda8b1d
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 20 00:09:24 2002 +0000

    	Fixed: 3020720 - dropping a folder in the page address makes the folder open in Finder, empties the field
    
            * Misc.subproj/WebNSPasteboardExtras.m:
            (-[NSPasteboard _web_bestURL]): Don't accept directories.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2767 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index eab595c..571514d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-11-19  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: 3020720 - dropping a folder in the page address makes the folder open in Finder, empties the field
+
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (-[NSPasteboard _web_bestURL]): Don't accept directories.
+
+2002-11-19  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: 3068112 - extra line breaks when copying from source window
 
         * Misc.subproj/WebSearchableTextView.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index eab595c..571514d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-11-19  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: 3020720 - dropping a folder in the page address makes the folder open in Finder, empties the field
+
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (-[NSPasteboard _web_bestURL]): Don't accept directories.
+
+2002-11-19  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: 3068112 - extra line breaks when copying from source window
 
         * Misc.subproj/WebSearchableTextView.m:
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 25c0db3..781e704 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -55,8 +55,11 @@ NSString *WebURLNamePboardType = nil;
         NSArray *files = [self propertyListForType:NSFilenamesPboardType];
         if ([files count] == 1) {
             NSString *file = [files objectAtIndex:0];
-            if ([WebController canShowFile:file]) {
-                return [[NSURL fileURLWithPath:file] _web_canonicalize];
+            BOOL isDirectory;
+            if([[NSFileManager defaultManager] fileExistsAtPath:file isDirectory:&isDirectory] && !isDirectory){
+                if ([WebController canShowFile:file]) {
+                    return [[NSURL fileURLWithPath:file] _web_canonicalize];
+                }
             }
         }
     }

-- 
WebKit Debian packaging