Revision: 7028
http://skim-app.svn.sourceforge.net/skim-app/?rev=7028&view=rev
Author: hofman
Date: 2010-12-31 12:09:32 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
add a comment
Modified Paths:
--------------
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2010-12-30 23:48:52 UTC (rev 7027)
+++ trunk/SKMainDocument.m 2010-12-31 12:09:32 UTC (rev 7028)
@@ -1589,7 +1589,7 @@
attr.data = (void *)data;
return attr;
}
-
+
- (void)passwordAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo {
NSString *password = [(NSString *)contextInfo autorelease];
if (returnCode == NSAlertDefaultReturn) {
@@ -1648,6 +1648,7 @@
}
- (BOOL)tryToUnlockDocument:(PDFDocument *)document {
+ BOOL didUnlock = NO;
if (NSAlertAlternateReturn != [[NSUserDefaults standardUserDefaults]
integerForKey:SKSavePasswordOptionKey]) {
NSString *fileID = [[self fileIDStrings] lastObject] ?: [pdfData
md5String];
if (fileID) {
@@ -1660,11 +1661,13 @@
SecKeychainItemFreeContent(NULL, passwordData);
- return [document unlockWithPassword:password];
+ didUnlock = [document unlockWithPassword:password];
+
+ // should we modify the password when it was in the old format
and we succeeded?
}
}
}
- return NO;
+ return didUnlock;
}
#pragma mark Scripting support
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit