Changeset 1116

Timestamp:

Nov 22, 2006, 1:06:31 AM (16 years ago)

Author:

livings124

Message:

some more fixes with url dragging and url download error messages

File:

• trunk/macosx/Controller.m (modified) (5 diffs)

trunk/macosx/Controller.m

@@ -499 +499 @@
             @"Download not a torrent -> title"), [NSString stringWithFormat:
             NSLocalizedString(@"It appears that the file \"%@\" from %@ is not a torrent file.",
-            @"Download not a torrent -> message"), suggestedName, [[[download request] URL] absoluteString]],
+            @"Download not a torrent -> message"), suggestedName,
+            [[[[download request] URL] absoluteString] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding]],
             NSLocalizedString(@"OK", @"Download not a torrent -> button"), nil, nil);
         
@@ -520 +521 @@
         @"Torrent download error -> title"), [NSString stringWithFormat:
         NSLocalizedString(@"The torrent could not be downloaded from %@ because an error occurred (%@).",
-        @"Torrent download failed -> message"), [[[download request] URL] absoluteString],
+        @"Torrent download failed -> message"),
+        [[[[download request] URL] absoluteString] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding],
         [error localizedDescription]], NSLocalizedString(@"OK", @"Torrent download failed -> button"), nil, nil);
     
@@ -1841 +1843 @@
         [filesToOpen release];
     }
-    
-    if ([[pasteboard types] containsObject: NSURLPboardType])
+    else if ([[pasteboard types] containsObject: NSURLPboardType])
     {
         NSURL * url;
@@ -1848 +1849 @@
             [self openURL: url];
     }
-    
-    if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
+    else if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
     {
         //remember selected rows if needed
@@ -1901 +1901 @@
         }
     }
+    else;
     
     return YES;