From fb017f644ace1bb687400534d29ae3d987e5f98a Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 15 Mar 2010 12:43:49 +0000
Subject: [PATCH] * Source/NSString.m (-initWithCoder:): Handle format used for
 XIB encoding.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29962 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog         |  4 ++++
 Source/NSString.m | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e91a1ae2..7a25eb33d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-15  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSString.m (-initWithCoder:): Handle format used for XIB encoding.
+
 2010-03-14  Adam Fedor  <fedor@mallory>
 
 	* Source/NSHTTPCookie.m (+requestHeaderFieldsWithCookies:): 
diff --git a/Source/NSString.m b/Source/NSString.m
index 2f26a757b..6d59da438 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -4611,8 +4611,18 @@ static NSFileManager *fm = nil;
 {
   if ([aCoder allowsKeyedCoding])
     {
-      NSString *string = (NSString*)[(NSKeyedUnarchiver*)aCoder
-			     _decodePropertyListForKey: @"NS.string"];
+      NSString *string = nil;
+
+      if ([aCoder containsValueForKey: @"NS.string"])
+          {
+            string = (NSString*)[(NSKeyedUnarchiver*)aCoder
+                                    _decodePropertyListForKey: @"NS.string"];
+          }
+      else if ([aCoder containsValueForKey: @"NS.bytes"])
+        {
+          string = (NSString*)[(NSKeyedUnarchiver*)aCoder
+                                    decodeObjectForKey: @"NS.bytes"];
+        }
 
       self = [self initWithString: string];
     }