Author: mlytwyn
Date: Thu Jan 26 16:39:06 2017
New Revision: 40304
URL: http://svn.gna.org/viewcvs/gnustep?rev=40304&view=rev
Log:
Fix XIB 5 <string> processing to replace previously decoded object
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m?rev=40304&r1=40303&r2=40304&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSXib5KeyedUnarchiver.m
Thu Jan 26 16:39:06 2017
@@ -2285,6 +2285,7 @@
{
id object = [super objectForXib: element];
+ // If no object check other possibilities related to XIB 5...
if (object == nil)
{
NSString *elementName = [element type];
@@ -2334,6 +2335,10 @@
options:
NSDataBase64DecodingIgnoreUnknownCharacters];
object = AUTORELEASE([[NSString alloc] initWithData: data
encoding: NSUTF8StringEncoding]);
RELEASE(data);
+
+ // Replace previous object...
+ if ([element attributeForKey: @"id"])
+ [decoded setObject: object forKey: [element attributeForKey:
@"id"]];
}
}
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
