gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/GSXib5KeyedUnarchiver.m (alternateName:): Be more careful

Browse source 
when chopping of part of the name.
This commit is contained in:
fredkiefer 2020-07-03 19:37:45 +02:00
parent 56047d27e6
commit c66019024f
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2020-07-03 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSXib5KeyedUnarchiver.m (alternateName:): Be more careful
when chopping of part of the name.
2020-07-03 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSNib.h,

3
Source/GSXib5KeyedUnarchiver.m
View file

@ -449,7 +449,8 @@ static NSArray *XmlBoolDefaultYes = nil;
NSString *postfix = [self alternateName: name startIndex: 2];
NSString *typeName = [currentElement attributeForKey: @"key"];
if ((typeName != nil) && [postfix hasPrefix: typeName])
if ((typeName != nil) && [postfix hasPrefix: typeName] &&
([XmlTagToObjectClassMap objectForKey: postfix] == nil))
{
return [self alternateName: name startIndex: [typeName length] + 2];
}

4
Source/NSTabView.m
View file

@ -563,6 +563,8 @@
if ([aDecoder containsValueForKey: @"NSTabViewItems"])
{
ASSIGN(_items, [aDecoder decodeObjectForKey: @"NSTabViewItems"]);
[_items makeObjectsPerformSelector: @selector(_setTabView:) withObject: self];
}
if ([aDecoder containsValueForKey: @"NSSelectedTabViewItem"])
{
@ -570,7 +572,7 @@
// and sets it to [self contentRect].
//
// This is desirable because the subview frame will be different
// depending on whether the arcive is from Cocoa or GNUstep,
// depending on whether the archive is from Cocoa or GNUstep,
// and which GNUstep theme was active at save time.
//
// However, it does mean that the tab view contents should be