Various bug fixes that were reported:

Various bug fixes that were reported:

	1. Correct event span computation for some cases.
	2. Correct drawing of events that span more than one day
	3. EventEditor supports 12/24 hour formats.

mguel.

svn path=/trunk/; revision=216

6 files changed, 8 insertions, 12 deletions

diff --git a/calendar/eventedit.c b/calendar/eventedit.c
index b843ad049c..5f728793ba 100644
--- a/calendar/eventedit.c
+++ b/calendar/eventedit.c
@@ -228,7 +228,7 @@ event_editor_setup_time_frame (EventEditor *ee)
 		ee->ical->dtstart = time (NULL);
 		ee->ical->dtend   = time_add_minutes (ee->ical->dtstart, 30);
 	}
-	ee->start_time = start_time = gnome_date_edit_new (ee->ical->dtstart, TRUE);
+	ee->start_time = start_time = gnome_date_edit_new (ee->ical->dtstart, TRUE, !am_pm_flag);
 	gnome_date_edit_set_popup_range ((GnomeDateEdit *) start_time, day_begin, day_end);
 	gtk_signal_connect (GTK_OBJECT (start_time), "date_changed",
 			    GTK_SIGNAL_FUNC (check_dates), ee);
@@ -244,7 +244,7 @@ event_editor_setup_time_frame (EventEditor *ee)
 			  0, 0);
 
 	/* 2. End time */
-	ee->end_time   = end_time   = gnome_date_edit_new (ee->ical->dtend, TRUE);
+	ee->end_time   = end_time   = gnome_date_edit_new (ee->ical->dtend, TRUE, !am_pm_flag);
 	gnome_date_edit_set_popup_range ((GnomeDateEdit *) end_time,   day_begin, day_end);
 	gtk_signal_connect (GTK_OBJECT (end_time), "date_changed",
 			    GTK_SIGNAL_FUNC (check_dates), ee);
@@ -1201,7 +1201,7 @@ ee_rp_init_ending_date (EventEditor *ee)
 	else
 		enddate = ee->ical->dtend;
 
-	ee->recur_ed_end_on = widget = gnome_date_edit_new (enddate, FALSE);
+	ee->recur_ed_end_on = widget = gnome_date_edit_new (enddate, FALSE, !am_pm_flag);
 	gtk_box_pack_start (GTK_BOX (ihbox), widget, FALSE, FALSE, 0);
 
 	gtk_signal_connect (GTK_OBJECT (radio1), "toggled",
@@ -1356,7 +1356,7 @@ ee_rp_init_exceptions (EventEditor *ee)
 	vbox = gtk_vbox_new (FALSE, 4);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
 
-	ee->recur_ex_date = widget = gnome_date_edit_new (time (NULL), FALSE);
+	ee->recur_ex_date = widget = gnome_date_edit_new (time (NULL), FALSE, !am_pm_flag);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
 
 	widget = gtk_button_new_with_label (_("Add exception"));
diff --git a/calendar/gnome-cal.c b/calendar/gnome-cal.c
index a54d4e4a78..6e2f318fae 100644
--- a/calendar/gnome-cal.c
+++ b/calendar/gnome-cal.c
@@ -336,7 +336,6 @@ mark_gtk_calendar_day (iCalObject *obj, time_t start, time_t end, void *c)
 {
 	GtkCalendar *gtk_cal = c;
 	struct tm tm_s;
-	int days, day;
 	time_t t, day_end;
 
 	tm_s = *localtime (&start);
diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c
index b843ad049c..5f728793ba 100644
--- a/calendar/gui/eventedit.c
+++ b/calendar/gui/eventedit.c
@@ -228,7 +228,7 @@ event_editor_setup_time_frame (EventEditor *ee)
 		ee->ical->dtstart = time (NULL);
 		ee->ical->dtend   = time_add_minutes (ee->ical->dtstart, 30);
 	}
-	ee->start_time = start_time = gnome_date_edit_new (ee->ical->dtstart, TRUE);
+	ee->start_time = start_time = gnome_date_edit_new (ee->ical->dtstart, TRUE, !am_pm_flag);
 	gnome_date_edit_set_popup_range ((GnomeDateEdit *) start_time, day_begin, day_end);
 	gtk_signal_connect (GTK_OBJECT (start_time), "date_changed",
 			    GTK_SIGNAL_FUNC (check_dates), ee);
@@ -244,7 +244,7 @@ event_editor_setup_time_frame (EventEditor *ee)
 			  0, 0);
 
 	/* 2. End time */
-	ee->end_time   = end_time   = gnome_date_edit_new (ee->ical->dtend, TRUE);
+	ee->end_time   = end_time   = gnome_date_edit_new (ee->ical->dtend, TRUE, !am_pm_flag);
 	gnome_date_edit_set_popup_range ((GnomeDateEdit *) end_time,   day_begin, day_end);
 	gtk_signal_connect (GTK_OBJECT (end_time), "date_changed",
 			    GTK_SIGNAL_FUNC (check_dates), ee);
@@ -1201,7 +1201,7 @@ ee_rp_init_ending_date (EventEditor *ee)
 	else
 		enddate = ee->ical->dtend;
 
-	ee->recur_ed_end_on = widget = gnome_date_edit_new (enddate, FALSE);
+	ee->recur_ed_end_on = widget = gnome_date_edit_new (enddate, FALSE, !am_pm_flag);
 	gtk_box_pack_start (GTK_BOX (ihbox), widget, FALSE, FALSE, 0);
 
 	gtk_signal_connect (GTK_OBJECT (radio1), "toggled",
@@ -1356,7 +1356,7 @@ ee_rp_init_exceptions (EventEditor *ee)
 	vbox = gtk_vbox_new (FALSE, 4);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
 
-	ee->recur_ex_date = widget = gnome_date_edit_new (time (NULL), FALSE);
+	ee->recur_ex_date = widget = gnome_date_edit_new (time (NULL), FALSE, !am_pm_flag);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
 
 	widget = gtk_button_new_with_label (_("Add exception"));
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index a54d4e4a78..6e2f318fae 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -336,7 +336,6 @@ mark_gtk_calendar_day (iCalObject *obj, time_t start, time_t end, void *c)
 {
 	GtkCalendar *gtk_cal = c;
 	struct tm tm_s;
-	int days, day;
 	time_t t, day_end;
 
 	tm_s = *localtime (&start);
diff --git a/calendar/gui/year-view.c b/calendar/gui/year-view.c
index e8cb12feb3..0a104f25a3 100644
--- a/calendar/gui/year-view.c
+++ b/calendar/gui/year-view.c
@@ -169,7 +169,6 @@ year_view_mark_day (iCalObject *ical, time_t start, time_t end, void *closure)
 {
 	GncalYearView *yview = (GncalYearView *) closure;
 	struct tm tm_s;
-	int days, day;
 	time_t t, day_end;
 
 	tm_s = *localtime (&start);
diff --git a/calendar/year-view.c b/calendar/year-view.c
index e8cb12feb3..0a104f25a3 100644
--- a/calendar/year-view.c
+++ b/calendar/year-view.c
@@ -169,7 +169,6 @@ year_view_mark_day (iCalObject *ical, time_t start, time_t end, void *closure)
 {
 	GncalYearView *yview = (GncalYearView *) closure;
 	struct tm tm_s;
-	int days, day;
 	time_t t, day_end;
 
 	tm_s = *localtime (&start);