Fixup merging of config into the Control process

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@38330 72102866-910b-0410-8b05-ffd578937521

EcControl.m

@@ -2881,6 +2881,23 @@ static NSString*	cmdWord(NSArray* a, unsigned int pos)
 
   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];
 
       /*

EcUserDefaults.h

@@ -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;

EcUserDefaults.m

@@ -280,6 +280,11 @@ static NSLock 		*lock = nil;
     aPrefix strict: enforcePrefix] autorelease];
 }
 
+- (NSDictionary*) configuration
+{
+  return [self volatileDomainForName: @"EcConfiguration"];
+}
+
 - (NSString*) defaultsPrefix
 {
   return nil;	// No prefix in use ... this is not a proxy