X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FXScreenSaverConfigSheet.h;h=b2fd489996b7df87f3c147715b5b5a2806e341dc;hp=452c2672c1b1def62ca77aae10a5f41e0ed7ccc5;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe diff --git a/OSX/XScreenSaverConfigSheet.h b/OSX/XScreenSaverConfigSheet.h index 452c2672..b2fd4899 100644 --- a/OSX/XScreenSaverConfigSheet.h +++ b/OSX/XScreenSaverConfigSheet.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2006-2012 Jamie Zawinski +/* xscreensaver, Copyright (c) 2006-2013 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -53,6 +53,7 @@ { NSString *saver_name; NSUserDefaultsController *userDefaultsController; + NSUserDefaultsController *globalDefaultsController; NSDictionary *defaultOptions; const XrmOptionDescRec *opts; id xml_root, xml_parsing; @@ -69,9 +70,10 @@ } -- (id)initWithXMLFile: (NSString *) xml_file - options: (const XrmOptionDescRec *) opts - controller: (NSUserDefaultsController *) prefs - defaults: (NSDictionary *) defs; +- (id)initWithXML: (NSData *) xml_data + options: (const XrmOptionDescRec *) opts + controller: (NSUserDefaultsController *) prefs + globalController: (NSUserDefaultsController *) globalPrefs + defaults: (NSDictionary *) defs; @end