X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fwebcollage-cocoa.m;h=d6505df2f5f7cda72df903a218dd618fb78d5304;hb=c141c2b05e374757b6499d12bb8a6d4d943b1529;hp=c9f628abbb695c094b2e2ade301ad2fd168ec73b;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/webcollage-cocoa.m b/hacks/webcollage-cocoa.m
index c9f628ab..d6505df2 100644
--- a/hacks/webcollage-cocoa.m
+++ b/hacks/webcollage-cocoa.m
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2008 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2011 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -85,7 +85,7 @@ display_image (state *st, const char *file)
   NSImage *image = [[NSImage alloc] 
                      initWithContentsOfFile:
                        [NSString stringWithCString: file
-                                          encoding: kCFStringEncodingUTF8]];
+                                          encoding: NSUTF8StringEncoding]];
 
   if (! image) {
     fprintf (stderr, "webcollage: failed to load \"%s\"\n", file);
@@ -247,7 +247,7 @@ webcollage_init (Display *dpy, Window window)
     for (i = 0; i < sizeof(sigs)/sizeof(*sigs); i++) {
       if (signal (sigs[i], signal_handler)) {
         perror ("webcollage: signal");
-        exit (1);
+        //exit (1);
       }
     }
   }