compatibility fix

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

diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog
index b930e35a98cb8d7d9370812f041214a8a66f61c5..deffe6d5aaf8244f90ab7f30ba9cda8c7cdd49d3 100644 (file)
--- a/sope-core/EOControl/ChangeLog
+++ b/sope-core/EOControl/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-02  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * EOSortOrdering.m: use keyPaths instead of just keys in
+         keyOrderComparator() function - this is feature compatible with
+         Apple's EOF 4.5 (v4.5.64)
+
 2006-02-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * EOKeyValueCoding.m: do not use EOKeyValueCoding with gstep-base (KVC

diff --git a/sope-core/EOControl/EOControl.xcodeproj/project.pbxproj b/sope-core/EOControl/EOControl.xcodeproj/project.pbxproj
index 9cbc8415dfaa8011e8a26e68643a5d064c91103b..7e7c3dee51f9e87fb1bae783cd0e51e74d6e528b 100644 (file)
--- a/sope-core/EOControl/EOControl.xcodeproj/project.pbxproj
+++ b/sope-core/EOControl/EOControl.xcodeproj/project.pbxproj
@@ -341,7 +341,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.63;
+                               DYLIB_CURRENT_VERSION = 4.5.64;
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = common.h;
@@ -465,7 +465,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.63;
+                               DYLIB_CURRENT_VERSION = 4.5.64;
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -504,7 +504,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.63;
+                               DYLIB_CURRENT_VERSION = 4.5.64;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -546,7 +546,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.63;
+                               DYLIB_CURRENT_VERSION = 4.5.64;
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = common.h;

diff --git a/sope-core/EOControl/EOSortOrdering.m b/sope-core/EOControl/EOSortOrdering.m
index 3dd7e00cc42d44ccf3542a8f4323ad3b5f22c498..586ad1a83970034cd2099cd25c5dfdeedf5adfcf 100644 (file)
--- a/sope-core/EOControl/EOSortOrdering.m
+++ b/sope-core/EOControl/EOSortOrdering.m
@@ -195,8 +195,8 @@ static int keyOrderComparator(id o1, id o2, EOSortOrderingContext *context) {
     key = [context->orderings[i] key];
     sel = [context->orderings[i] selector];
     
-    v1 = [o1 valueForKey:key];
-    v2 = [o2 valueForKey:key];
+    v1 = [o1 valueForKeyPath:key];
+    v2 = [o2 valueForKeyPath:key];
 
     if (v1 == v2)
       result = NSOrderedSame;

diff --git a/sope-core/EOControl/Version b/sope-core/EOControl/Version
index 645b0033f8950f99fd834a9346f6527653b302c2..c41a410afe17ef80110f2389ce30444bb7fee116 100644 (file)
--- a/sope-core/EOControl/Version
+++ b/sope-core/EOControl/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=63
+SUBMINOR_VERSION:=64