From b1ce49ff43e4e87d8b43948a49d74c02b69617bd Mon Sep 17 00:00:00 2001
From: stefanbidi <stefanbidi@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 28 Jan 2011 00:49:16 +0000
Subject: [PATCH] Added -isEqual: to NSCalendar.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31965 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                  |  4 ++++
 Source/NSCalendar.m        | 10 ++++++++++
 Source/NSNumberFormatter.m |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f14c9d60e..858311a15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-27  Stefan Bidigaray <stefanbidi@gmail.com>
+
+	* Source/NSCalendar.m: Add -isEqual:.
+
 2011-01-27  Stefan Bidigaray <stefanbidi@gmail.com>
 
 	* Source/NSCalendar.m: Open UCalendar before use.
diff --git a/Source/NSCalendar.m b/Source/NSCalendar.m
index 7058aa603..a8a44a5d5 100644
--- a/Source/NSCalendar.m
+++ b/Source/NSCalendar.m
@@ -70,6 +70,7 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
 
 @interface NSCalendar (PrivateMethods)
 - (void) _resetCalendar;
+- (void *) _UCalendar;
 - (NSString *) _localeIdWithLocale: (NSLocale *) locale;
 - (NSString *)_localeIdentifier;
 - (void) _setLocaleIdentifier: (NSString *) identifier;
@@ -109,6 +110,11 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
 #endif
 }
 
+- (void *) _UCalendar
+{
+  return _cal;
+}
+
 - (NSString *) _localeIdWithLocale: (NSLocale *) locale
 {
   NSString *result;
@@ -524,6 +530,9 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
 
 - (BOOL) isEqual: (id) obj
 {
+#if GS_USE_ICU == 1
+  return (BOOL)ucal_equivalentTo (_cal, [obj _UCalendar]);
+#else
   if ([obj isKindOfClass: [self class]])
     {
       if (![_identifier isEqual: [obj calendarIdentifier]])
@@ -536,6 +545,7 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
     }
   
   return NO;
+#endif
 }
 
 - (void) encodeWithCoder: (NSCoder*)encoder
diff --git a/Source/NSNumberFormatter.m b/Source/NSNumberFormatter.m
index c129ae326..afc220e03 100644
--- a/Source/NSNumberFormatter.m
+++ b/Source/NSNumberFormatter.m
@@ -1160,7 +1160,7 @@ static NSUInteger _defaultBehavior = 0;
 
 - (BOOL) generatesDecimalNubmers
 {
-  return _genDecimal;
+  return NO; // FIXME
 }