From e115a0a2ad8f7c2666de18e8f800781f9b19345b Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 12 Apr 2010 02:55:50 +0000 Subject: [PATCH] #3133 Inspector > Trackers: Look for favicon.png --- macosx/TrackerCell.m | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/macosx/TrackerCell.m b/macosx/TrackerCell.m index 4bdd78138..8bab6e31f 100644 --- a/macosx/TrackerCell.m +++ b/macosx/TrackerCell.m @@ -224,6 +224,7 @@ NSMutableSet * fTrackerIconLoading; { NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + //try favicon.ico NSURL * favIconUrl = [NSURL URLWithString: [baseAddress stringByAppendingPathComponent: @"favicon.ico"]]; NSURLRequest * request = [NSURLRequest requestWithURL: favIconUrl cachePolicy: NSURLRequestUseProtocolCachePolicy @@ -231,6 +232,17 @@ NSMutableSet * fTrackerIconLoading; NSData * iconData = [NSURLConnection sendSynchronousRequest: request returningResponse: NULL error: NULL]; NSImage * icon = [[NSImage alloc] initWithData: iconData]; + //try favicon.png + if (!icon) + { + favIconUrl = [NSURL URLWithString: [baseAddress stringByAppendingPathComponent: @"favicon.png"]]; + + request = [NSURLRequest requestWithURL: favIconUrl cachePolicy: NSURLRequestUseProtocolCachePolicy + timeoutInterval: 30.0]; + iconData = [NSURLConnection sendSynchronousRequest: request returningResponse: NULL error: NULL]; + icon = [[NSImage alloc] initWithData: iconData]; + } + if (icon) { [fTrackerIconCache setObject: icon forKey: baseAddress];