Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-31 19:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix opening .webloc and .url files via dock or open menu. b=242934 sr=pinkerton

Browse Source
This commit is contained in:
joshmoz%gmail.com 2005-01-20 18:12:27 +00:00
parent 6942802a81
commit a1e11edcfb
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
camino/src/application/MainController.mm
View File

@ -411,6 +411,27 @@ const int kReuseWindowOnAE = 2;
}
}
/*
This takes an NSURL to a local file, and if that file is a file that contains
a URL we want and isn't the content itself, we return the URL it contains.
Otherwise, we return the URL we originally got. Right now this supports .url and
.webloc files.
*/
+(NSURL*) decodeLocalFileURL:(NSURL*)url
{
NSString *urlPathString = [url path];
if ([[urlPathString pathExtension] isEqualToString:@"url"]) {
NSString *decodedURL = [MainController urlStringFromIEURLFile:urlPathString];
if (decodedURL)
url = [NSURL URLWithString:decodedURL];
}
else if ([[urlPathString pathExtension] isEqualToString:@"webloc"]) {
NSString *decodedURL = [MainController urlStringFromWebloc:urlPathString];
if (decodedURL)
url = [NSURL URLWithString:decodedURL];
}
return url;
}
+(BOOL) isBlankURL:(NSString*)inURL
{
@ -481,6 +502,7 @@ const int kReuseWindowOnAE = 2;
NSArray* array = [NSArray arrayWithObjects: @"htm",@"html",@"shtml",@"xhtml",@"xml",
@"txt",@"text",
@"gif",@"jpg",@"jpeg",@"png",@"bmp",
@"webloc",@"url",
nil];
int result = [openPanel runModalForTypes: array];
if (result == NSOKButton) {
@ -489,6 +511,7 @@ const int kReuseWindowOnAE = 2;
return;
NSURL* url = [urlArray objectAtIndex: 0];
[[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:url];
url = [MainController decodeLocalFileURL:url];
BrowserWindowController* browserController = [self getMainWindowBrowserController];
if (browserController)
[browserController loadURL:[url absoluteString] referrer:nil activate:YES allowPopups:NO];
@ -952,8 +975,8 @@ const int kReuseWindowOnAE = 2;
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
{
[self openNewWindowOrTabWithURL:[[NSURL fileURLWithPath:filename] absoluteString] andReferrer:nil];
NSURL* urlToOpen = [MainController decodeLocalFileURL:[NSURL fileURLWithPath:filename]];
[self openNewWindowOrTabWithURL:[urlToOpen absoluteString] andReferrer:nil];
return YES;
}