evolution-sharp r211 - in trunk: . evolution evolution/src

[pchen svn gnome org]

Author: pchen
Date: Mon Feb 16 16:18:48 2009
New Revision: 211
URL: http://svn.gnome.org/viewvc/evolution-sharp?rev=211&view=rev

Log:
Fixes bug #563917

Modified:
   trunk/ChangeLog
   trunk/evolution/TestCal.cs
   trunk/evolution/src/CalRecurrence.cs

Modified: trunk/evolution/TestCal.cs
==============================================================================
--- trunk/evolution/TestCal.cs	(original)
+++ trunk/evolution/TestCal.cs	Mon Feb 16 16:18:48 2009
@@ -67,19 +67,19 @@
 				foreach (CalRecurrence recur in comp.RRules) {
 					Console.WriteLine ("--- Recurrence data starts ---");
 
-					Console.WriteLine ("Frequeny:- {0}", recur.freq);
-					Console.WriteLine ("Count:- {0}", recur.count);
-					Console.WriteLine ("Interval:- {0}", recur.interval);
+					Console.WriteLine ("Frequeny:- {0}", recur.Frequency);
+					Console.WriteLine ("Count:- {0}", recur.Count);
+					Console.WriteLine ("Interval:- {0}", recur.Interval);
 //					Console.WriteLine ("Enddate:- {0}", recur.Until.DateTime);
-					Console.WriteLine ("BySecond:- {0}", recur.bySecond);
-					Console.WriteLine ("ByMinute:- {0}", recur.byMinute);
-					Console.WriteLine ("ByHour:- {0}", recur.byHour);
-					Console.WriteLine ("ByDay:- {0}", recur.byDay);
-					Console.WriteLine ("ByMonthDay:- {0}", recur.byMonthDay);
-					Console.WriteLine ("ByYearDay:- {0}", recur.byYearDay);
-					Console.WriteLine ("ByWeekNumber:- {0}", recur.byWeekNumber);
-					Console.WriteLine ("ByMonth:- {0}", recur.byMonth);
-					Console.WriteLine ("BySetPos:- {0}", recur.bySetPos);
+					Console.WriteLine ("BySecond:- {0}", recur.BySecond);
+					Console.WriteLine ("ByMinute:- {0}", recur.ByMinute);
+					Console.WriteLine ("ByHour:- {0}", recur.ByHour);
+					Console.WriteLine ("ByDay:- {0}", recur.ByDay);
+					Console.WriteLine ("ByMonthDay:- {0}", recur.ByMonthDay);
+					Console.WriteLine ("ByYearDay:- {0}", recur.ByYearDay);
+					Console.WriteLine ("ByWeekNumber:- {0}", recur.ByWeekNumber);
+					Console.WriteLine ("ByMonth:- {0}", recur.ByMonth);
+					Console.WriteLine ("BySetPos:- {0}", recur.BySetPos);
 
 					Console.WriteLine ("--- Recurrence Data ends ---");
 					Console.WriteLine ("Recur string: \"{0}\"", recur.ToString());

Modified: trunk/evolution/src/CalRecurrence.cs
==============================================================================
--- trunk/evolution/src/CalRecurrence.cs	(original)
+++ trunk/evolution/src/CalRecurrence.cs	Mon Feb 16 16:18:48 2009
@@ -53,41 +53,44 @@
 
 	[StructLayout(LayoutKind.Sequential)]
 	public class CalRecurrence {
-		public FrequencyType freq;
+		/* dummy variable to not break ABI */
+		public IntPtr Handle;
+
+		public FrequencyType Frequency;
 		
 		Icaltimetype until;
-		public int count;
+		public int Count;
 		
-		public short interval;
+		public short Interval;
 		
-		public WeekDayType week_start_day;
+		public WeekDayType WeekStartDay;
 		
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=61)]
-		public short[] bySecond;
+		public short[] BySecond;
 		
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=61)]
-		public short[] byMinute;
+		public short[] ByMinute;
 
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=25)]
-		public short[] byHour;
+		public short[] ByHour;
 
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=364)]
-		public short[] byDay;
+		public short[] ByDay;
 
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=32)]
-		public short[] byMonthDay;
+		public short[] ByMonthDay;
 
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=367)]
-		public short[] byYearDay;
+		public short[] ByYearDay;
 
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=54)]
-		public short[] byWeekNumber;
+		public short[] ByWeekNumber;
 		
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=13)]
-		public short[] byMonth;
+		public short[] ByMonth;
 
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst=367)]
-		public short[] bySetPos;
+		public short[] BySetPos;
 
 		private short[] GetInitializedArray (int len)
 		{
@@ -103,21 +106,21 @@
 
 		public CalRecurrence ()
 		{
-			freq = FrequencyType.FREQUENCY_NO;
-			count = 0;
+			Frequency = FrequencyType.FREQUENCY_NO;
+			Count = 0;
 			//week_start_day = -1;
-			interval = 1;
-			week_start_day = WeekDayType.NO_WEEKDAY;
+			Interval = 1;
+			WeekStartDay = WeekDayType.NO_WEEKDAY;
 			until = new Icaltimetype ();
-			bySecond = GetInitializedArray (61);
-			byMinute = GetInitializedArray (61);
-			byHour = GetInitializedArray (25);
-			byDay = GetInitializedArray (364);
-			byMonthDay = GetInitializedArray (32);
-			byYearDay = GetInitializedArray (367);
-			byWeekNumber = GetInitializedArray (54);
-			byMonth = GetInitializedArray (13);
-			bySetPos = GetInitializedArray (367);
+			BySecond = GetInitializedArray (61);
+			ByMinute = GetInitializedArray (61);
+			ByHour = GetInitializedArray (25);
+			ByDay = GetInitializedArray (364);
+			ByMonthDay = GetInitializedArray (32);
+			ByYearDay = GetInitializedArray (367);
+			ByWeekNumber = GetInitializedArray (54);
+			ByMonth = GetInitializedArray (13);
+			BySetPos = GetInitializedArray (367);
 		}
 
 		public DateTime Until