Re: Bug syncing recurring events

[Alan Shutko <ats acm org>]

Alan Shutko <ats acm org> writes:

> Recurring events tend to pile up on the first of the
> month/week/recurring-interval. 

Repeating month by date was wrong syncing from the pilot, as was
something in eventedit.c, so it looked like repeat by pos was also
wrong.  Here's a patch... I believe both problems are severe enough
(and their fixes minimal enough) to be included.  Anyone know if this
code has been fixed in evolution?

(Please reply to at least the gnome-pilot-list, as I don't know if
I'm still on the gnome-pim list.)

-- 
Alan Shutko <ats acm org> - In a variety of flavors!
38 days, 20 hours, 11 minutes, 45 seconds till we run away.
He who hesitates is not only lost, but miles from the next exit.

Index: gncal/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-pim/gncal/ChangeLog,v
retrieving revision 1.283
diff -u -r1.283 ChangeLog
--- gncal/ChangeLog	2000/07/28 14:09:07	1.283
+++ gncal/ChangeLog	2000/10/03 19:22:19
@@ -1,3 +1,12 @@
+2000-10-03  Alan Shutko  <ats acm org>
+
+	* calendar-conduit.c (ical_from_remote_record): recur->u.month_day
+	was getting the interval, not the day of the month.
+
+	* eventedit.c (make_numbered_menu): Fix make_numbered_menu to
+	select the correct item (otherwise, recurrence dropdowns were one
+	off).
+
 2000-07-28  Fatih Demir	<kabalak gmx net>
 
 	* calendar-conduit-control-applet.desktop & gncal.desktop &\
Index: gncal/calendar-conduit.c
===================================================================
RCS file: /cvs/gnome/gnome-pim/gncal/calendar-conduit.c,v
retrieving revision 1.28
diff -u -r1.28 calendar-conduit.c
--- gncal/calendar-conduit.c	2000/07/06 07:20:32	1.28
+++ gncal/calendar-conduit.c	2000/10/03 19:22:19
@@ -425,7 +425,7 @@
 			
 		case repeatMonthlyByDate:
 			obj->recur->type = RECUR_MONTHLY_BY_DAY;
-			obj->recur->u.month_day = a.repeatFrequency;
+			obj->recur->u.month_day = a.begin.tm_mday;
 			break;
 			
 		case repeatWeekly:
Index: gncal/eventedit.c
===================================================================
RCS file: /cvs/gnome/gnome-pim/gncal/eventedit.c,v
retrieving revision 1.65
diff -u -r1.65 eventedit.c
--- gncal/eventedit.c	2000/03/14 21:09:49	1.65
+++ gncal/eventedit.c	2000/10/03 19:22:20
@@ -950,8 +950,8 @@
 make_numbered_menu (struct numbered_item *items, int sel)
 {
 	GtkWidget *option_menu, *menu;
-	int i;
-
+	int i, history = 0;
+        
 	option_menu = gtk_option_menu_new ();
 	menu = gtk_menu_new ();
 
@@ -962,10 +962,13 @@
 		gtk_object_set_user_data (GTK_OBJECT (item), &items[i]);
 		gtk_menu_append (GTK_MENU (menu), item);
 		gtk_widget_show (item);
+
+                if (items[i] == sel)
+                    history = i;
 	}
 
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), sel);
+	gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), history);
 
 	return option_menu;
 }