Author: mlytwyn
Date: Wed Dec 28 21:47:33 2016
New Revision: 40280
URL: http://svn.gna.org/viewcvs/gnustep?rev=40280&view=rev
Log:
Merge/fix GSXibLoader.m from GUI trunk revision 40273
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSXibLoader.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSXibLoader.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSXibLoader.m?rev=40280&r1=40279&r2=40280&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSXibLoader.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSXibLoader.m Wed Dec
28 21:47:33 2016
@@ -32,12 +32,12 @@
#import <Foundation/NSException.h>
#import <Foundation/NSFileManager.h>
#import <Foundation/NSKeyedArchiver.h>
+#import <Foundation/NSKeyValueCoding.h>
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
#import <Foundation/NSXMLParser.h>
#import <Foundation/NSXMLDocument.h>
#import <Foundation/NSXMLElement.h>
-#import <GNUstepBase/GSMime.h>
#import "AppKit/NSApplication.h"
#import "AppKit/NSNib.h"
@@ -1034,7 +1034,7 @@
}
NS_HANDLER
{
- NSLog(@"Exception occured while loading model: %@",[localException
reason]);
+ NSLog(@"Exception occurred while loading model: %@",[localException
reason]);
// TEST_RELEASE(unarchiver);
}
NS_ENDHANDLER
@@ -1275,7 +1275,7 @@
}
NS_HANDLER
{
- NSLog(@"Exception occured while parsing Xib: %@",[localException
reason]);
+ NSLog(@"Exception occurred while parsing Xib: %@",[localException
reason]);
DESTROY(self);
}
NS_ENDHANDLER
@@ -1584,10 +1584,11 @@
if ([type isEqualToString: @"base64-UTF8"])
{
- NSData *d = [new dataUsingEncoding: NSASCIIStringEncoding];
- d = [GSMimeDocument decodeBase64: d];
+ NSData *d = [[NSData alloc] initWithBase64EncodedString: new
+ options: 0];
new = AUTORELEASE([[NSString alloc] initWithData: d
encoding:
NSUTF8StringEncoding]);
+ RELEASE(d);
}
// empty strings are not nil!
@@ -1698,9 +1699,8 @@
}
else if ([@"bytes" isEqualToString: elementName])
{
- id new = [[element value] dataUsingEncoding: NSASCIIStringEncoding
- allowLossyConversion: NO];
- new = [GSMimeDocument decodeBase64: new];
+ id new = AUTORELEASE([[NSData alloc] initWithBase64EncodedString:
[element value]
+ options:
NSDataBase64DecodingIgnoreUnknownCharacters]);
if (objID != nil)
[decoded setObject: new forKey: objID];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
