fixed a KVC issue on gstep-base

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1210 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog
index 4d85b6d3fe420a628d1ed6ff0e49c8cdf8a8dfee..b930e35a98cb8d7d9370812f041214a8a66f61c5 100644 (file)
--- a/sope-core/EOControl/ChangeLog
+++ b/sope-core/EOControl/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * EOKeyValueCoding.m: do not use EOKeyValueCoding with gstep-base (KVC
+         implemented directly in base) (v4.5.63)
+
 2005-11-17  Helge Hess  <helge.hess@opengroupware.org>
 
        * v4.5.62

diff --git a/sope-core/EOControl/EOKeyValueCoding.m b/sope-core/EOControl/EOKeyValueCoding.m
index 02976c4fd330688b0e754bd7cb592c1687624763..ff694c64f90423770c240d8177bca6b13c76e5f5 100644 (file)
--- 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 3fea82c731bd0ba8206616e89526d2b254f05cf4..645b0033f8950f99fd834a9346f6527653b302c2 100644 (file)
--- 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 65be8081d9c81e99de919e85b21a991610bab8eb..2ad1beabe0058fb04a3e00a7b232c25ca093b030 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGBundleManager.m: minor code cleanups (v4.5.182)
+
 2006-01-22  Helge Hess  <helge.hess@opengroupware.org>
 
        * FdExt.subproj/NGPropertyListParser.m (_skipComments): fixed a bug

diff --git a/sope-core/NGExtensions/NGBundleManager.m b/sope-core/NGExtensions/NGBundleManager.m
index 5d006c7f0f24d83b3cb62a015eb6ef54ddf556e0..305e11afd075d7be84b135e856401aa82f22b139 100644 (file)
--- 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 2caa4b2997d819aaf2ba33ac7bd7c45e8cec7768..a642b68b55bfca8390eec71c2dea8b02d1e49b22 100644 (file)
--- 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