bugfix, bumped versions

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

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 183b935cd1de57dfc77a11e2909ab4267283baf6..4857ac00f4ce5da88ae10a6ab9d33ee988ed825f 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-02  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * NGCalendarDateRange.m: Bugfix for -containsDate: (v4.5.154)
+
 2005-03-01  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGBundleManager.m (-pathForResource:ofType:inDirectory:languages:):

diff --git a/sope-core/NGExtensions/NGCalendarDateRange.m b/sope-core/NGExtensions/NGCalendarDateRange.m
index baed5ff5ad76cc223382990aebd873692ffed82b..c6b1ce288e59a4af606f7f1f67698d62b96de3cb 100644 (file)
--- a/sope-core/NGExtensions/NGCalendarDateRange.m
+++ b/sope-core/NGExtensions/NGCalendarDateRange.m
@@ -125,9 +125,16 @@
   return [NGCalendarDateRange calendarDateRangeWithStartDate:a endDate:b];
 }
 
-- (BOOL)containsDate:(NSCalendarDate *)date {
-  return ([self->startDate earlierDate:date] == self->startDate && 
-         [self->endDate compare:date] == NSOrderedDescending) ? YES : NO;
+- (BOOL)containsDate:(NSCalendarDate *)_date {
+  NSComparisonResult result;
+  
+  result = [self->startDate compare:_date];
+  if (!((result == NSOrderedSame) || (result == NSOrderedAscending)))
+    return NO;
+  result = [self->endDate compare:_date];
+  if (result == NSOrderedAscending)
+    return NO;
+  return YES;
 }
 
 - (BOOL)containsDateRange:(NGCalendarDateRange *)_range {

diff --git a/sope-core/NGExtensions/NGExtensions.xcode/project.pbxproj b/sope-core/NGExtensions/NGExtensions.xcode/project.pbxproj
index a3c0c363ae1e7d740d22b6b996355566275019ec..656d865c41ac9845c9141f9bc48304f099125ce0 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions.xcode/project.pbxproj
+++ b/sope-core/NGExtensions/NGExtensions.xcode/project.pbxproj
@@ -1715,7 +1715,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.144;
+                               DYLIB_CURRENT_VERSION = 4.5.154;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index e21b17b7f912e0991f6c6a716e909f72576da02b..d0fd569f2cd710303943820957568f1445ec85a9 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=153
+SUBMINOR_VERSION:=154
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39

diff --git a/sope-core/sope-core.xcode/project.pbxproj b/sope-core/sope-core.xcode/project.pbxproj
index cc1861d4c37b3039a165e2ee67fa26a0a03e1230..9dab271ce3a372466f1db3453f9401d50703792a 100644 (file)
--- a/sope-core/sope-core.xcode/project.pbxproj
+++ b/sope-core/sope-core.xcode/project.pbxproj
@@ -65,10 +65,6 @@
                        mainGroup = ADDF476606DA572500C4E7F8;
                        projectDirPath = "";
                        projectReferences = (
-                               {
-                                       ProductGroup = ADDF478506DA580C00C4E7F8;
-                                       ProjectRef = ADDF478406DA580C00C4E7F8;
-                               },
                                {
                                        ProductGroup = ADDF478706DA581F00C4E7F8;
                                        ProjectRef = ADDF478606DA581F00C4E7F8;
@@ -77,6 +73,10 @@
                                        ProductGroup = ADDF478906DA583300C4E7F8;
                                        ProjectRef = ADDF478806DA583300C4E7F8;
                                },
+                               {
+                                       ProductGroup = ADDF478506DA580C00C4E7F8;
+                                       ProjectRef = ADDF478406DA580C00C4E7F8;
+                               },
                        );
                        targets = (
                                ADDF479906DA58D700C4E7F8,