[evolution-patches] 55172 Fixing syncing of recurring monthly events by day

[JP Rosevear <jpr novell com>]

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2500.2.3
diff -u -p -r1.2500.2.3 ChangeLog
--- ChangeLog	10 Sep 2004 15:58:42 -0000	1.2500.2.3
+++ ChangeLog	15 Sep 2004 16:10:59 -0000
@@ -1,3 +1,11 @@
+2004-09-15  JP Rosevear  <jpr novell com>
+
+	Fixes #55172
+	
+	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
+	handle -1 (last) for monthly recurrences and check both by_set_pos
+	and by_day since either can indicate this type of recurrence
+
 2004-09-09  JP Rosevear  <jpr novell com>
 
 	Fixes #65454
Index: conduits/calendar/calendar-conduit.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/conduits/calendar/calendar-conduit.c,v
retrieving revision 1.124
diff -u -p -r1.124 calendar-conduit.c
--- conduits/calendar/calendar-conduit.c	26 Aug 2004 02:12:07 -0000	1.124
+++ conduits/calendar/calendar-conduit.c	15 Sep 2004 16:10:59 -0000
@@ -892,9 +892,11 @@ local_record_from_comp (ECalLocalRecord 
 					break;
 				}
 			
-				/* FIX ME Not going to work with -ve by_day */
+				/* Not going to work with -ve  by_day/by_set_pos other than -1,
+				 * pilot doesn't support that anyhow */
 				local->appt->repeatType = repeatMonthlyByDay;
-				switch (icalrecurrencetype_day_position (recur->by_day[0])) {
+				switch (recur->by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX ? recur->by_set_pos[0] 
+					: icalrecurrencetype_day_position (recur->by_day[0])) {
 				case 1:
 					local->appt->repeatDay = dom1stSun;
 					break;
@@ -907,6 +909,7 @@ local_record_from_comp (ECalLocalRecord 
 				case 4:
 					local->appt->repeatDay = dom4thSun;
 					break;
+				case -1:
 				case 5:
 					local->appt->repeatDay = domLastSun;
 					break;