From 4baeaf8d6b48fac816f2ce71a77d8eac3a9ee421 Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Tue, 13 Oct 2009 20:54:12 +0000 Subject: [PATCH] Move warning method that was shown too often. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28824 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/GSTextStorage.m | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0d1cd797..c090092ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-13 Fred Kiefer + + * Source/GSTextStorage.m (-initWithCoder:): Display the warning + only when we load an old .gorm file. + 2009-10-12 Fred Kiefer * Source/NSScroller.m (-mouseDown:): In NSWindows95InterfaceStyle diff --git a/Source/GSTextStorage.m b/Source/GSTextStorage.m index d04a7702a..70b7e0762 100644 --- a/Source/GSTextStorage.m +++ b/Source/GSTextStorage.m @@ -465,12 +465,15 @@ _attributesAtIndexEffectiveRange( - (id) initWithCoder: (NSCoder*)aCoder { - NSLog(@"Warning - decoding archive containing obsolete %@ object - please delete/replace this archive", NSStringFromClass([self class])); self = [super initWithCoder: aCoder]; if([aCoder allowsKeyedCoding] == NO) { - [aCoder decodeValueOfObjCType: @encode(id) at: &_textChars]; - [aCoder decodeValueOfObjCType: @encode(id) at: &_infoArray]; + if ([aCoder versionForClassName: @"GSTextStorage"] != (NSInteger)NSNotFound) + { + NSLog(@"Warning - decoding archive containing obsolete %@ object - please delete/replace this archive", NSStringFromClass([self class])); + [aCoder decodeValueOfObjCType: @encode(id) at: &_textChars]; + [aCoder decodeValueOfObjCType: @encode(id) at: &_infoArray]; + } } return self; }