summaryrefslogtreecommitdiff
path: root/tikzit/src/gtk/TikzDocument.m
diff options
context:
space:
mode:
authorAlex Merry <dev@randomguy3.me.uk>2013-08-07 00:43:49 +0100
committerAlex Merry <dev@randomguy3.me.uk>2013-08-07 00:45:50 +0100
commit5a94458d9ee3ee8afd978477c755200df432a9b0 (patch)
treebea24359a6300f4dd2ce4d1ad517f63a52cca972 /tikzit/src/gtk/TikzDocument.m
parente306c53d9e31c7ee09a131c765cbcec67fdd2565 (diff)
Add variant of stringWithContentsOfFile that produces an error
It turns out that the [NSString stringWithContentsOfFile:] family of methods do not have a way of reporting why a file could not be read; [NSString stringWithContentsOfFile:usedEncoding:error:] will only set the error object if there was a problem with decoding. So, we cook our own variant that tries to figure out why opening the file failed. User-visible effect: in the GTK+ port, if you try to open a file from the "open recent" menu that no longer exists, you will get a more helpful error message.
Diffstat (limited to 'tikzit/src/gtk/TikzDocument.m')
-rw-r--r--tikzit/src/gtk/TikzDocument.m4
1 files changed, 1 insertions, 3 deletions
diff --git a/tikzit/src/gtk/TikzDocument.m b/tikzit/src/gtk/TikzDocument.m
index 6e013b1..bff5a2e 100644
--- a/tikzit/src/gtk/TikzDocument.m
+++ b/tikzit/src/gtk/TikzDocument.m
@@ -139,9 +139,7 @@
styleManager:(StyleManager*)manager
error:(NSError**)error
{
- NSStringEncoding enc; // we can't pass in NULL here...
- NSString *t = [NSString stringWithContentsOfFile:pth
- usedEncoding:&enc error:error];
+ NSString *t = [NSString stringWithContentsOfFile:pth error:error];
if (t == nil) {
[self release];
return nil;