aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/cal-util/cal-component.c2
-rw-r--r--calendar/gui/calendar-model.c6
-rw-r--r--calendar/gui/e-day-view.c28
-rw-r--r--calendar/gui/e-week-view.c20
-rw-r--r--calendar/gui/event-editor.c8
-rw-r--r--calendar/gui/gncal-todo.c2
-rw-r--r--calendar/gui/gnome-cal.c4
8 files changed, 39 insertions, 35 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0a058b1f57..c7067a733d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-24 JP Rosevear <jpr@helixcode.com>
+
+ * Update for libical 0.19
+
2000-08-24 Christopher James Lahey <clahey@helixcode.com>
* gui/calendar-commands.c, gui/e-day-view.c, gui/e-week-view.c,
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
index f2f9caff7d..a3cb053be8 100644
--- a/calendar/cal-util/cal-component.c
+++ b/calendar/cal-util/cal-component.c
@@ -614,7 +614,7 @@ ensure_mandatory_properties (CalComponent *comp)
struct icaltimetype t;
tim = time (NULL);
- t = icaltimetype_from_timet (tim, FALSE);
+ t = icaltime_from_timet (tim, FALSE, FALSE);
priv->dtstamp = icalproperty_new_dtstamp (t);
icalcomponent_add_property (priv->icalcomp, priv->dtstamp);
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 822a01d218..e9f1a8884b 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -872,7 +872,7 @@ set_completed (CalComponent *comp, const char *value)
cal_component_set_completed (comp, NULL);
return;
} else {
- itt = icaltimetype_from_timet (t, FALSE);
+ itt = icaltime_from_timet (t, FALSE, TRUE);
cal_component_set_completed (comp, &itt);
}
}
@@ -895,7 +895,7 @@ set_datetime (CalComponent *comp, const char *value,
CalComponentDateTime dt;
struct icaltimetype itt;
- itt = icaltimetype_from_timet (t, FALSE);
+ itt = icaltime_from_timet (t, FALSE, TRUE);
dt.value = &itt;
dt.tzid = NULL;
@@ -1761,7 +1761,7 @@ calendar_model_mark_task_complete (CalendarModel *model,
percent = 100;
cal_component_set_percent (comp, &percent);
- itt = icaltimetype_from_timet (time (NULL), FALSE);
+ itt = icaltime_from_timet (time (NULL), FALSE, TRUE);
cal_component_set_completed (comp, &itt);
if (!cal_client_update_object (priv->client, comp))
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index dbc628c6d3..928ca25b4e 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -2415,10 +2415,10 @@ e_day_view_on_new_appointment (GtkWidget *widget, gpointer data)
date.value = &itt;
date.tzid = NULL;
- *date.value = icaltimetype_from_timet (dtstart, FALSE);
+ *date.value = icaltime_from_timet (dtstart, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
- *date.value = icaltimetype_from_timet (dtend, FALSE);
+ *date.value = icaltime_from_timet (dtend, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
cal_component_commit_sequence (comp);
@@ -2466,7 +2466,7 @@ e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
list = g_slist_append (list, date);
date = g_new0 (CalComponentDateTime, 1);
date->value = g_new (struct icaltimetype, 1);
- *date->value = icaltimetype_from_timet (event->start, TRUE);
+ *date->value = icaltime_from_timet (event->start, TRUE, TRUE);
cal_component_set_exdate_list (comp, list);
cal_component_free_exdate_list (list);
@@ -2520,7 +2520,7 @@ e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
cal_component_get_exdate_list (comp, &list);
date = g_new0 (CalComponentDateTime, 1);
date->value = g_new (struct icaltimetype, 1);
- *date->value = icaltimetype_from_timet (event->start, TRUE);
+ *date->value = icaltime_from_timet (event->start, TRUE, TRUE);
list = g_slist_append (list, date);
cal_component_set_exdate_list (comp, list);
cal_component_free_exdate_list (list);
@@ -2536,9 +2536,9 @@ e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
date = g_new0 (CalComponentDateTime, 1);
date->value = g_new (struct icaltimetype, 1);
- *date->value = icaltimetype_from_timet (event->start, FALSE);
+ *date->value = icaltime_from_timet (event->start, FALSE, TRUE);
cal_component_set_dtstart (new_comp, date);
- *date->value = icaltimetype_from_timet (event->end, FALSE);
+ *date->value = icaltime_from_timet (event->end, FALSE, TRUE);
cal_component_set_dtend (new_comp, date);
cal_component_free_datetime (date);
@@ -3058,11 +3058,11 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
date.value = g_new (struct icaltimetype, 1);
if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {
dt = day_view->day_starts[day_view->resize_start_row];
- *date.value = icaltimetype_from_timet (dt, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
} else {
dt = day_view->day_starts[day_view->resize_end_row + 1];
- *date.value = icaltimetype_from_timet (dt, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
}
g_free (date.value);
@@ -3102,11 +3102,11 @@ e_day_view_finish_resize (EDayView *day_view)
date.value = g_new (struct icaltimetype, 1);
if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {
dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
- *date.value = icaltimetype_from_timet (dt, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
} else {
dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
- *date.value = icaltimetype_from_timet (dt, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
}
g_free (date.value);
@@ -5586,13 +5586,13 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
date.value = g_new (struct icaltimetype, 1);
dt = day_view->day_starts[day] + start_offset * 60;
- *date.value = icaltimetype_from_timet (dt, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
if (end_offset == -1 || end_offset == 0)
dt = day_view->day_starts[day + num_days];
else
dt = day_view->day_starts[day + num_days - 1] + end_offset * 60;
- *date.value = icaltimetype_from_timet (dt, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
g_free (date.value);
@@ -5688,10 +5688,10 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget,
date.value = g_new (struct icaltimetype, 1);
dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;
- *date.value = icaltimetype_from_timet (dt, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;
- *date.value = icaltimetype_from_timet (dt, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
g_free (date.value);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index f7f35bd4e9..9da2b94c42 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2636,9 +2636,9 @@ e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
dtend = week_view->day_starts[week_view->selection_end_day + 1];
date.value = g_new0 (struct icaltimetype, 1);
- *date.value = icaltimetype_from_timet (dtstart, FALSE);
+ *date.value = icaltime_from_timet (dtstart, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
- *date.value = icaltimetype_from_timet (dtend, FALSE);
+ *date.value = icaltime_from_timet (dtend, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
g_free (date.value);
@@ -2756,13 +2756,13 @@ e_week_view_on_new_appointment (GtkWidget *widget, gpointer data)
date.tzid = NULL;
*date.value =
- icaltimetype_from_timet (week_view->day_starts[week_view->selection_start_day],
- FALSE);
+ icaltime_from_timet (week_view->day_starts[week_view->selection_start_day],
+ FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
*date.value =
- icaltimetype_from_timet (week_view->day_starts[week_view->selection_end_day + 1],
- FALSE);
+ icaltime_from_timet (week_view->day_starts[week_view->selection_end_day + 1],
+ FALSE, TRUE);
cal_component_set_dtend (comp, &date);
gnome_calendar_edit_object (week_view->calendar, comp);
@@ -2813,7 +2813,7 @@ e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
list = g_slist_append (list, date);
date = g_new0 (CalComponentDateTime, 1);
date->value = g_new (struct icaltimetype, 1);
- *date->value = icaltimetype_from_timet (event->start, TRUE);
+ *date->value = icaltime_from_timet (event->start, TRUE, TRUE);
cal_component_set_exdate_list (comp, list);
cal_component_free_exdate_list (list);
@@ -2869,7 +2869,7 @@ e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
cal_component_get_exdate_list (comp, &list);
date = g_new0 (CalComponentDateTime, 1);
date->value = g_new (struct icaltimetype, 1);
- *date->value = icaltimetype_from_timet (event->start, TRUE);
+ *date->value = icaltime_from_timet (event->start, TRUE, TRUE);
list = g_slist_append (list, date);
cal_component_set_exdate_list (comp, list);
cal_component_free_exdate_list (list);
@@ -2885,9 +2885,9 @@ e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
date = g_new0 (CalComponentDateTime, 1);
date->value = g_new (struct icaltimetype, 1);
- *date->value = icaltimetype_from_timet (event->start, TRUE);
+ *date->value = icaltime_from_timet (event->start, TRUE, TRUE);
cal_component_set_dtstart (new_comp, date);
- *date->value = icaltimetype_from_timet (event->end, TRUE);
+ *date->value = icaltime_from_timet (event->end, TRUE, TRUE);
cal_component_set_dtend (new_comp, date);
cal_component_free_datetime (date);
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index f0246b3309..6f8a3a9154 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -951,7 +951,7 @@ dialog_to_comp_object (EventEditor *ee)
date.value = g_new (struct icaltimetype, 1);
t = e_dialog_dateedit_get (priv->start_time);
- *date.value = icaltimetype_from_timet (t, FALSE);
+ *date.value = icaltime_from_timet (t, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
/* If the all_day toggle is set, the end date is inclusive of the
@@ -961,7 +961,7 @@ dialog_to_comp_object (EventEditor *ee)
if (all_day_event)
t = time_day_end (t);
- *date.value = icaltimetype_from_timet (t, FALSE);
+ *date.value = icaltime_from_timet (t, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
g_free (date.value);
@@ -1066,7 +1066,7 @@ dialog_to_comp_object (EventEditor *ee)
* secs to get get next day, in accordance to the RFC
*/
t = e_dialog_dateedit_get (priv->recurrence_ending_date_end_on_date) + 86400;
- recur->until = icaltimetype_from_timet (t, TRUE);
+ recur->until = icaltime_from_timet (t, TRUE, TRUE);
} else if (e_dialog_toggle_get (priv->recurrence_ending_date_end_after)) {
recur->count = e_dialog_spin_get_int (priv->recurrence_ending_date_end_after_count);
}
@@ -1081,7 +1081,7 @@ dialog_to_comp_object (EventEditor *ee)
time_t *t;
t = gtk_clist_get_row_data (exception_list, i);
- *tt = icaltimetype_from_timet (*t, FALSE);
+ *tt = icaltime_from_timet (*t, FALSE, TRUE);
list = g_slist_prepend (list, tt);
}
diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c
index 44df93832a..899c953723 100644
--- a/calendar/gui/gncal-todo.c
+++ b/calendar/gui/gncal-todo.c
@@ -81,7 +81,7 @@ ok_button (GtkWidget *widget, GnomeDialog *dialog)
due_date = GNOME_DATE_EDIT (gtk_object_get_data(GTK_OBJECT(dialog), "due_date"));
d = gnome_date_edit_get_date (due_date);
date.value = g_new0 (struct icaltimetype, 1);
- *date.value = icaltimetype_from_timet (d, 1);
+ *date.value = icaltime_from_timet (d, 1, TRUE);
cal_component_set_dtend (comp, &date);
/* Summary */
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index c445ac7317..ee5215164a 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1420,10 +1420,10 @@ gnome_calendar_new_appointment (GnomeCalendar *gcal)
comp = cal_component_new ();
cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
- itt = icaltimetype_from_timet (dtstart, 0);
+ itt = icaltime_from_timet (dtstart, 0, TRUE);
cal_component_set_dtstart (comp, &dt);
- itt = icaltimetype_from_timet (dtend, 0);
+ itt = icaltime_from_timet (dtend, 0, TRUE);
cal_component_set_dtend (comp, &dt);
gnome_calendar_edit_object (gcal, comp);