From 430c2261f80335706cf96cf67e0d0aed43c45aa8 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 22 Mar 2011 20:55:43 +0000
Subject: [PATCH] Monotone-Parent: 6e7ac4cd1529c1ca1209faeb43583ee333facec8
 Monotone-Revision: ede91a980338742748957c740a70ce61e1bcccae

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-03-22T20:55:43
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/ChangeLog       |  7 +++++++
 SOPE/NGCards/iCalByDayMask.h |  2 ++
 SOPE/NGCards/iCalByDayMask.m | 14 ++++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 86dab1f70..82c5bfe13 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* iCalByDayMask.m (-occursOnDay:withWeekOccurrence:): fixed method
+	to return true only when it is valid to do so...
+	(-weekDayOccurrences): new method that returns a reference to the
+	days ivar.
+
 2011-03-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* CardGroup.m (-removeChild:, -removeChildren:): new
diff --git a/SOPE/NGCards/iCalByDayMask.h b/SOPE/NGCards/iCalByDayMask.h
index 1ca57ee34..b094150db 100644
--- a/SOPE/NGCards/iCalByDayMask.h
+++ b/SOPE/NGCards/iCalByDayMask.h
@@ -67,6 +67,8 @@ typedef iCalWeekOccurrence iCalWeekOccurrences[7];
 - (iCalWeekDay) firstDay;
 - (int) firstOccurrence;
 
+- (iCalWeekOccurrences *) weekDayOccurrences;
+
 - (NSString *) asRuleString;
 - (NSString *) asRuleStringWithIntegers;
 
diff --git a/SOPE/NGCards/iCalByDayMask.m b/SOPE/NGCards/iCalByDayMask.m
index b586d66b6..9c54e4df0 100644
--- a/SOPE/NGCards/iCalByDayMask.m
+++ b/SOPE/NGCards/iCalByDayMask.m
@@ -207,7 +207,7 @@
 - (BOOL) occursOnDay: (iCalWeekDay) weekDay
   withWeekOccurrence: (iCalWeekOccurrence) occurrence
 {
-  return (days[weekDay] | occurrence) > 0;
+  return (days[weekDay] & occurrence) > 0;
 }
 
 - (BOOL) occursOnDay: (iCalWeekDay) weekDay
@@ -244,13 +244,10 @@
   iCalWeekDay day;
 
   day = -1;
-  for (i = 0; i < 7; i++)
+  for (i = 0; day == -1 && i < 7; i++)
     {
       if (days[i])
-	{
-	  day = i;
-	  break;
-	}
+        day = i;
     }
   
   return day;
@@ -270,6 +267,11 @@
   return occurrence;
 }
 
+- (iCalWeekOccurrences *) weekDayOccurrences
+{
+  return &days;
+}
+
 - (int) _iCalWeekOccurrenceIntValue: (iCalWeekOccurrence) weekOccurrence
 {
   int i = 0;