Revision: 6916
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6916&view=rev
Author:   hofman
Date:     2010-12-02 13:05:43 +0000 (Thu, 02 Dec 2010)

Log Message:
-----------
return NSUserCanceledError when reading notes failed and the user said not to 
proceed, to avoid showing two alerts

Modified Paths:
--------------
    trunk/SKMainDocument.m

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2010-12-02 12:51:38 UTC (rev 6915)
+++ trunk/SKMainDocument.m      2010-12-02 13:05:43 UTC (rev 6916)
@@ -708,6 +708,7 @@
                         data = nil;
                         [pdfDoc release];
                         pdfDoc = nil;
+                        error = [NSError errorWithDomain:NSCocoaErrorDomain 
code:NSUserCancelledError userInfo:[NSDictionary 
dictionaryWithObjectsAndKeys:error, NSUnderlyingErrorKey, nil]];
                     }
                 } else if ([array count]) {
                     [tmpData setNoteDicts:array];
@@ -749,6 +750,7 @@
                         data = nil;
                         [pdfDoc release];
                         pdfDoc = nil;
+                        error = [NSError errorWithDomain:NSCocoaErrorDomain 
code:NSUserCancelledError userInfo:[NSDictionary 
dictionaryWithObjectsAndKeys:error, NSUnderlyingErrorKey, nil]];
                     }
                 }
                 if (pdfDoc) {


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

------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to