Revision: 7820
http://skim-app.svn.sourceforge.net/skim-app/?rev=7820&view=rev
Author: hofman
Date: 2012-12-09 12:49:23 +0000 (Sun, 09 Dec 2012)
Log Message:
-----------
don't use 10.6+ URL code as this is not a good reason to drop 10.4 and 10.5
support at least in the code
Modified Paths:
--------------
trunk/SkimNotes/NSFileManager_SKNExtensions.m
trunk/SkimNotes/PDFDocument_SKNExtensions.m
Modified: trunk/SkimNotes/NSFileManager_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/NSFileManager_SKNExtensions.m 2012-12-09 12:36:50 UTC
(rev 7819)
+++ trunk/SkimNotes/NSFileManager_SKNExtensions.m 2012-12-09 12:49:23 UTC
(rev 7820)
@@ -226,17 +226,17 @@
extension = [extension lowercaseString];
if ([extension isEqualToString:SKIM_EXTENSION] || [extension
isEqualToString:PDF_EXTENSION]) {
NSArray *files = [self subpathsAtPath:[aURL path]];
- NSString *filename = [[[aURL lastPathComponent]
stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
+ NSString *filename = [[[[aURL path] lastPathComponent]
stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
if ([files containsObject:filename] == NO) {
NSUInteger idx = [[files
valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:extension];
filename = idx == NSNotFound ? nil : [files objectAtIndex:idx];
}
if (filename)
- fileURL = [aURL URLByAppendingPathComponent:filename];
+ fileURL = [NSURL fileURLWithPath:[[aURL path]
stringByAppendingPathComponent:filename]];
} else {
NSURL *skimFileURL = [self bundledFileURLWithExtension:SKIM_EXTENSION
inPDFBundleAtURL:aURL error:outError];
if (skimFileURL) {
- fileURL = [[skimFileURL URLByDeletingPathExtension]
URLByAppendingPathExtension:extension];
+ fileURL = [NSURL fileURLWithPath:[[[skimFileURL path]
stringByDeletingPathExtension] stringByAppendingPathExtension:extension]];
if ([self fileExistsAtPath:[fileURL path]] == NO)
fileURL = nil;
}
Modified: trunk/SkimNotes/PDFDocument_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFDocument_SKNExtensions.m 2012-12-09 12:36:50 UTC (rev
7819)
+++ trunk/SkimNotes/PDFDocument_SKNExtensions.m 2012-12-09 12:49:23 UTC (rev
7820)
@@ -47,7 +47,7 @@
- (id)initWithURL:(NSURL *)url readSkimNotes:(NSArray **)notes {
NSFileManager *fm = [NSFileManager defaultManager];
NSURL *pdfURL = url;
- BOOL isPDFBundle = [[url pathExtension] caseInsensitiveCompare:@"pdfd"] ==
NSOrderedSame;
+ BOOL isPDFBundle = [[[url path] pathExtension]
caseInsensitiveCompare:@"pdfd"] == NSOrderedSame;
if (isPDFBundle)
pdfURL = [fm bundledFileURLWithExtension:@"pdf" inPDFBundleAtURL:url
error:NULL];
if (self = [self initWithURL:pdfURL]) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
