[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit c86e82de1b537c7767ce3836acd16892e721fe4f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 15 18:19:24 2002 +0000

    	Fixed bug where URLs dragged to the content area were not made canonical
    	the way URLs dragged to the page address field are.
    
            * Misc.subproj/WebNSPasteboardExtras.m: (-[NSPasteboard _web_bestURL]):
    	Make URLs canonical before returning them.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2326 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2b1a5a9..7475cf9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-15  Darin Adler  <darin at apple.com>
+
+	Fixed bug where URLs dragged to the content area were not made canonical
+	the way URLs dragged to the page address field are.
+
+        * Misc.subproj/WebNSPasteboardExtras.m: (-[NSPasteboard _web_bestURL]):
+	Make URLs canonical before returning them.
+
 2002-10-15  Chris Blumenberg  <cblu at apple.com>
 
 	If a file is renamed during download because a file of the same name already exists, show this in the UI.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2b1a5a9..7475cf9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-10-15  Darin Adler  <darin at apple.com>
+
+	Fixed bug where URLs dragged to the content area were not made canonical
+	the way URLs dragged to the page address field are.
+
+        * Misc.subproj/WebNSPasteboardExtras.m: (-[NSPasteboard _web_bestURL]):
+	Make URLs canonical before returning them.
+
 2002-10-15  Chris Blumenberg  <cblu at apple.com>
 
 	If a file is renamed during download because a file of the same name already exists, show this in the UI.
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 1f7c612..6d65826 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -36,35 +36,26 @@ NSString *WebURLNamePboardType = nil;
     NSArray *types = [self types];
 
     if ([types containsObject:NSURLPboardType]) {
-        NSURL *URLFromPasteboard;
-        NSString *scheme;
-
-        URLFromPasteboard = [NSURL URLFromPasteboard:self];
-        scheme = [URLFromPasteboard scheme];
+        NSURL *URLFromPasteboard = [NSURL URLFromPasteboard:self];
+        NSString *scheme = [URLFromPasteboard scheme];
         if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) {
-            return URLFromPasteboard;
+            return [URLFromPasteboard _web_canonicalize];
         }
     }
 
     if ([types containsObject:NSStringPboardType]) {
-        NSString *URLString;
-
-        URLString = [[self stringForType:NSStringPboardType] _web_stringByTrimmingWhitespace];
+        NSString *URLString = [[self stringForType:NSStringPboardType] _web_stringByTrimmingWhitespace];
         if ([URLString _web_looksLikeAbsoluteURL]) {
-            return [NSURL _web_URLWithString:URLString];
+            return [[NSURL _web_URLWithString:URLString] _web_canonicalize];
         }
     }
 
     if ([types containsObject:NSFilenamesPboardType]) {
-        NSArray *files;
-
-        files = [self propertyListForType:NSFilenamesPboardType];
+        NSArray *files = [self propertyListForType:NSFilenamesPboardType];
         if ([files count] == 1) {
-            NSString *file;
-
-            file = [files objectAtIndex:0];
+            NSString *file = [files objectAtIndex:0];
             if ([WebController canShowFile:file]) {
-                return [NSURL fileURLWithPath:file];
+                return [[NSURL fileURLWithPath:file] _web_canonicalize];
             }
         }
     }

-- 
WebKit Debian packaging