Author: rfm
Date: Fri May 29 18:43:56 2015
New Revision: 38589
URL: http://svn.gna.org/viewcvs/gnustep?rev=38589&view=rev
Log:
fix failure to include
Modified:
libs/ec/trunk/EcControl.m
Modified: libs/ec/trunk/EcControl.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcControl.m?rev=38589&r1=38588&r2=38589&view=diff
==============================================================================
--- libs/ec/trunk/EcControl.m (original)
+++ libs/ec/trunk/EcControl.m Fri May 29 18:43:56 2015
@@ -2637,7 +2637,8 @@
base = [self cmdDataDirectory];
path = [base stringByAppendingPathComponent: @"AlertConfig.plist"];
if ([mgr isReadableFileAtPath: path] == NO
- || (d = [NSDictionary dictionaryWithContentsOfFile: path]) == nil)
+ || (d = [NSDictionary dictionaryWithContentsOfFile: path]) == nil
+ || (d = [self recursiveInclude: d]) == nil)
{
[[self cmdLogFile: logname]
printf: @"Failed to load %@\n", path];
@@ -2717,7 +2718,8 @@
path = [base stringByAppendingPathComponent: @"Operators.plist"];
if ([mgr isReadableFileAtPath: path] == NO
- || (d = [NSDictionary dictionaryWithContentsOfFile: path]) == nil)
+ || (d = [NSDictionary dictionaryWithContentsOfFile: path]) == nil
+ || (d = [self recursiveInclude: d]) == nil)
{
[[self cmdLogFile: logname]
printf: @"Failed to load %@\n", path];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
