From 19e01e05f3a503f0beb23b9653206e79eab1e43c Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 20 Feb 2006 11:55:24 +0000 Subject: [PATCH] fixed a KVC issue on gstep-base git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1210 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-core/EOControl/ChangeLog | 5 +++++ sope-core/EOControl/EOKeyValueCoding.m | 4 ++-- sope-core/EOControl/Version | 2 +- sope-core/NGExtensions/ChangeLog | 4 ++++ sope-core/NGExtensions/NGBundleManager.m | 8 ++++---- sope-core/NGExtensions/Version | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog index 4d85b6d3..b930e35a 100644 --- a/sope-core/EOControl/ChangeLog +++ b/sope-core/EOControl/ChangeLog @@ -1,3 +1,8 @@ +2006-02-20 Helge Hess + + * EOKeyValueCoding.m: do not use EOKeyValueCoding with gstep-base (KVC + implemented directly in base) (v4.5.63) + 2005-11-17 Helge Hess * v4.5.62 diff --git a/sope-core/EOControl/EOKeyValueCoding.m b/sope-core/EOControl/EOKeyValueCoding.m index 02976c4f..ff694c64 100644 --- a/sope-core/EOControl/EOKeyValueCoding.m +++ b/sope-core/EOControl/EOKeyValueCoding.m @@ -30,7 +30,7 @@ static EONull *null = nil; -#if !NeXT_Foundation_LIBRARY +#if LIB_FOUNDATION_LIBRARY static id idMethodGetFunc(void* info1, void* info2, id self); static id idIvarGetFunc(void* info1, void* info2, id self); @@ -727,7 +727,7 @@ static inline BOOL setValue(NSString* key, id instance, id value) - (id)valueForKey:(NSString *)key { id val; - if ((val = getValue(key, self))) + if ((val = getValue(key, self)) != nil) return val; return nil; diff --git a/sope-core/EOControl/Version b/sope-core/EOControl/Version index 3fea82c7..645b0033 100644 --- a/sope-core/EOControl/Version +++ b/sope-core/EOControl/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=62 +SUBMINOR_VERSION:=63 diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index 65be8081..2ad1beab 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,3 +1,7 @@ +2006-02-20 Helge Hess + + * NGBundleManager.m: minor code cleanups (v4.5.182) + 2006-01-22 Helge Hess * FdExt.subproj/NGPropertyListParser.m (_skipComments): fixed a bug diff --git a/sope-core/NGExtensions/NGBundleManager.m b/sope-core/NGExtensions/NGBundleManager.m index 5d006c7f..305e11af 100644 --- a/sope-core/NGExtensions/NGBundleManager.m +++ b/sope-core/NGExtensions/NGBundleManager.m @@ -2095,17 +2095,17 @@ static BOOL debugLanguageLookup = NO; Class c; NSString *cname; - if ((c = [super principalClass])) + if ((c = [super principalClass]) != Nil) return c; if ((cname = [[self infoDictionary] objectForKey:@"NSPrincipalClass"]) ==nil) return Nil; - if ((c = NSClassFromString(cname))) + if ((c = NSClassFromString(cname)) != Nil) return c; - NSLog(@"%s: did not find principal class named '%@' of bundle %@", - __PRETTY_FUNCTION__, cname, self); + NSLog(@"%s: did not find principal class named '%@' of bundle %@, dict: %@", + __PRETTY_FUNCTION__, cname, self, [self infoDictionary]); return Nil; } diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index 2caa4b29..a642b68b 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,6 +1,6 @@ # version -SUBMINOR_VERSION:=181 +SUBMINOR_VERSION:=182 # v4.3.115 requires libFoundation v1.0.59 # v4.2.72 requires libEOControl v4.2.39 -- 2.39.5