Author: rfm
Date: Wed Feb 4 11:32:07 2015
New Revision: 38330
URL: http://svn.gna.org/viewcvs/gnustep?rev=38330&view=rev
Log:
Fixup merging of config into the Control process
Modified:
libs/ec/trunk/EcControl.m
libs/ec/trunk/EcUserDefaults.h
libs/ec/trunk/EcUserDefaults.m
Modified: libs/ec/trunk/EcControl.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcControl.m?rev=38330&r1=38329&r2=38330&view=diff
==============================================================================
--- libs/ec/trunk/EcControl.m (original)
+++ libs/ec/trunk/EcControl.m Wed Feb 4 11:32:07 2015
@@ -2881,6 +2881,23 @@
if (YES == changed)
{
+ /* Merge the globalconfiguration into this process' user defaults.
+ * Don't forget to preserve the Alerter config.
+ */
+ d = [config objectForKey: @"*"];
+ if ([d isKindOfClass: [NSDictionary class]])
+ {
+ d = [config objectForKey: @"*"];
+ }
+ if (YES == [d isKindOfClass: [NSDictionary class]])
+ {
+ dict = [d mutableCopy];
+ [dict setObject: [[self cmdDefaults] objectForKey: @"Alerter"]
+ forKey: @"Alerter"];
+ [[self cmdDefaults] setConfiguration: dict];
+ [dict release];
+ }
+
dict = [NSMutableDictionary dictionaryWithCapacity: 3];
/*
Modified: libs/ec/trunk/EcUserDefaults.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcUserDefaults.h?rev=38330&r1=38329&r2=38330&view=diff
==============================================================================
--- libs/ec/trunk/EcUserDefaults.h (original)
+++ libs/ec/trunk/EcUserDefaults.h Wed Feb 4 11:32:07 2015
@@ -53,6 +53,11 @@
+ (NSUserDefaults*) userDefaultsWithPrefix: (NSString*)aPrefix
strict: (BOOL)enforcePrefix;
+/** Returns the current configuration settings dictionary (as set using
+ * the -setConfiguration: method).
+ */
+- (NSDictionary*) configuration;
+
/** Returns the prefix used by the receiver, or nil if no prefix is in use.
*/
- (NSString*) defaultsPrefix;
Modified: libs/ec/trunk/EcUserDefaults.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcUserDefaults.m?rev=38330&r1=38329&r2=38330&view=diff
==============================================================================
--- libs/ec/trunk/EcUserDefaults.m (original)
+++ libs/ec/trunk/EcUserDefaults.m Wed Feb 4 11:32:07 2015
@@ -280,6 +280,11 @@
aPrefix strict: enforcePrefix] autorelease];
}
+- (NSDictionary*) configuration
+{
+ return [self volatileDomainForName: @"EcConfiguration"];
+}
+
- (NSString*) defaultsPrefix
{
return nil; // No prefix in use ... this is not a proxy
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
