[Vienna-rss-submits] SF.net SVN: vienna-rss: [356] trunk/2.1.0

[<joh...@us...>]

Revision: 356
Author:   johnson1234
Date:     2006-03-18 14:02:59 -0800 (Sat, 18 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/vienna-rss/?rev=356&view=rev

Log Message:
-----------
Port fixes for front window bug and folder image cache checking from 2.0.3.

Modified Paths:
--------------
    trunk/2.1.0/AppController.m
    trunk/2.1.0/Folder.m
Modified: trunk/2.1.0/AppController.m
===================================================================
--- trunk/2.1.0/AppController.m	2006-03-18 17:33:03 UTC (rev 355)
+++ trunk/2.1.0/AppController.m	2006-03-18 22:02:59 UTC (rev 356)
@@ -836,10 +836,14 @@
  */
 -(void)openURLInDefaultBrowser:(NSURL *)url
 {
+	Preferences * prefs = [Preferences standardPreferences];
+	
+	// This line is a workaround for OS X bug rdar://4450641
+	if ([prefs openLinksInBackground])
+		[mainWindow orderFront:self];
+	
 	// Launch in the foreground or background as needed
-	Preferences * prefs = [Preferences standardPreferences];
 	NSWorkspaceLaunchOptions lOptions = [prefs openLinksInBackground] ? NSWorkspaceLaunchWithoutActivation : NSWorkspaceLaunchDefault;
-	
 	[[NSWorkspace sharedWorkspace] openURLs:[NSArray arrayWithObject:url]
 					withAppBundleIdentifier:NULL
 									options:lOptions

Modified: trunk/2.1.0/Folder.m
===================================================================
--- trunk/2.1.0/Folder.m	2006-03-18 17:33:03 UTC (rev 355)
+++ trunk/2.1.0/Folder.m	2006-03-18 22:02:59 UTC (rev 356)
@@ -100,8 +100,15 @@
 	if (imagesCacheFolder != nil)
 	{
 		NSString * fullFilePath = [[imagesCacheFolder stringByAppendingPathComponent:baseURL] stringByAppendingPathExtension:@"tiff"];
-		NSData * imageData = [image TIFFRepresentationUsingCompression: NSTIFFCompressionLZW factor:1.0];
-		[[NSFileManager defaultManager] createFileAtPath:fullFilePath contents:imageData attributes:nil];
+		NSData *imageData = nil;
+		NS_DURING
+			imageData = [image TIFFRepresentation];
+		NS_HANDLER
+			imageData = nil;
+			NSLog(@"tiff exception with %@", fullFilePath);
+		NS_ENDHANDLER
+		if (imageData != nil)
+			[[NSFileManager defaultManager] createFileAtPath:fullFilePath contents:imageData attributes:nil];
 	}
 }
 
@@ -142,6 +149,15 @@
 			return;
 		}
 		
+		if (!isDir)
+		{
+			NSLog(@"The file at %@ is not a directory. Will not cache folder images in this session.", imagesCacheFolder);
+			[imagesCacheFolder release];
+			imagesCacheFolder = nil;
+			initializedFolderImagesArray = YES;
+			return;
+		}
+		
 		// Remember - not every file we find may be a valid image file. We use the filename as
 		// the key but check the extension too.
 		listOfFiles = [fileManager directoryContentsAtPath:imagesCacheFolder];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.