Revision: 26818
http://sourceforge.net/p/bibdesk/svn/26818
Author: hofman
Date: 2021-09-07 21:42:21 +0000 (Tue, 07 Sep 2021)
Log Message:
-----------
Don't care about passing the base URL to the bookmark for resolving
Modified Paths:
--------------
trunk/bibdesk/BDSKLinkedFile.m
Modified: trunk/bibdesk/BDSKLinkedFile.m
===================================================================
--- trunk/bibdesk/BDSKLinkedFile.m 2021-09-07 17:13:45 UTC (rev 26817)
+++ trunk/bibdesk/BDSKLinkedFile.m 2021-09-07 21:42:21 UTC (rev 26818)
@@ -561,8 +561,7 @@
if (refURL == nil) {
if ([alias isKindOfClass:[NSData class]]) {
- NSURL *baseURL = basePath ? [NSURL
fileURLWithPath:basePath isDirectory:YES] : nil;
- refURL = (NSURL
*)CFURLCreateByResolvingBookmarkData(kCFAllocatorDefault, (CFDataRef)alias,
kCFURLBookmarkResolutionWithoutUIMask |
kCFURLBookmarkResolutionWithoutMountingMask, (CFURLRef)baseURL, NULL, (Boolean
*)&shouldUpdate, NULL);
+ refURL = (NSURL
*)CFURLCreateByResolvingBookmarkData(kCFAllocatorDefault, (CFDataRef)alias,
kCFURLBookmarkResolutionWithoutUIMask |
kCFURLBookmarkResolutionWithoutMountingMask, NULL, NULL, (Boolean
*)&shouldUpdate, NULL);
shouldUpdate = shouldUpdate && basePath != nil && refURL
!= nil;
} else if ([alias isKindOfClass:[BDSKAlias class]]) {
FSRef aRef, baseRef;
@@ -623,7 +622,7 @@
hasRef = [alias getFSRef:&aRef baseRef:hasBaseRef ?
&baseRef : NULL shouldUpdate:&shouldUpdate];
shouldUpdate = (shouldUpdate || relativePath == nil) &&
hasBaseRef && hasRef;
} else if ([alias isKindOfClass:[NSData class]]) {
- NSURL *aURL = [NSURL URLByResolvingBookmarkData:alias
options:NSURLBookmarkResolutionWithoutUI relativeToURL:(basePath ? [NSURL
fileURLWithPath:basePath] : nil) bookmarkDataIsStale:NULL error:NULL];
+ NSURL *aURL = [NSURL URLByResolvingBookmarkData:alias
options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil
bookmarkDataIsStale:NULL error:NULL];
hasRef = BDSKPathToFSRef([aURL path], &aRef);
shouldUpdate = hasBaseRef && hasRef;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
