aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@helixcode.com>2000-12-14 12:48:45 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-12-14 12:48:45 +0800
commit5ff2d06f63f5596ac2bd8f991f5f207fe92e6f1f (patch)
treec106a806cb7e90514c63965ffba4f8834885189a /calendar/gui
parentdb80f3f3abe8beef6ff4e520f9d12c9d40679708 (diff)
downloadgsoc2013-evolution-5ff2d06f63f5596ac2bd8f991f5f207fe92e6f1f.tar.gz
gsoc2013-evolution-5ff2d06f63f5596ac2bd8f991f5f207fe92e6f1f.tar.zst
gsoc2013-evolution-5ff2d06f63f5596ac2bd8f991f5f207fe92e6f1f.zip
Even though icaltime_from_timet() now properly ignores the is_utc argument
2000-12-13 Federico Mena Quintero <federico@helixcode.com> * cal-util/cal-component.c (ensure_mandatory_properties): Even though icaltime_from_timet() now properly ignores the is_utc argument since time_t values *are* in UTC by definition, we were passing FALSE for that argument's value in a bunch of places. So although it is ignored, changed them to TRUE for consistency. Hopefully newer versions of libical will remove that argument entirely since it does not make sense to speak of non-absolute time_t values. * cal-util/cal-recur.c (cal_recur_set_rule_end_date): Likewise. * conduits/calendar/calendar-conduit.c (comp_from_remote_record): Likewise. * conduits/todo/todo-conduit.c (comp_from_remote_record): Likewise. * gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise. * gui/e-day-view.c (e_day_view_on_new_appointment): Likewise. (e_day_view_on_delete_occurrence): Likewise. (e_day_view_on_unrecur_appointment): Likewise. (e_day_view_on_unrecur_appointment): Likewise. (e_day_view_finish_long_event_resize): Likewise. (e_day_view_finish_resize): Likewise. (e_day_view_key_press): Likewise. (e_day_view_on_top_canvas_drag_data_received): Likewise. (e_day_view_on_main_canvas_drag_data_received): Likewise. * gui/e-week-view.c (e_week_view_key_press): Likewise. (e_week_view_on_new_appointment): Likewise. (e_week_view_on_delete_occurrence): Likewise. (e_week_view_on_unrecur_appointment): Likewise. * gui/event-editor.c (simple_recur_to_comp_object): Likewise. (recur_to_comp_object): Likewise. (dialog_to_comp_object): Likewise. * gui/gnome-cal.c (gnome_calendar_new_appointment): Likewise. svn path=/trunk/; revision=6995
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/calendar-model.c3
-rw-r--r--calendar/gui/dialogs/task-editor.c6
-rw-r--r--calendar/gui/e-day-view.c32
-rw-r--r--calendar/gui/e-week-view.c16
-rw-r--r--calendar/gui/event-editor.c8
-rw-r--r--calendar/gui/gnome-cal.c4
6 files changed, 34 insertions, 35 deletions
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index cbf8a1195c..6cf6501910 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -1932,8 +1932,7 @@ ensure_task_complete (CalComponent *comp,
}
if (set_completed) {
- new_completed = icaltime_from_timet (completed_date, FALSE,
- TRUE);
+ new_completed = icaltime_from_timet (completed_date, FALSE, TRUE);
cal_component_set_completed (comp, &new_completed);
}
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 34b62ba61e..b5e47cfdb7 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -942,7 +942,7 @@ dialog_to_comp_object (TaskEditor *tedit)
/* Due Date. */
t = e_date_edit_get_time (E_DATE_EDIT (priv->due_date));
if (t != -1) {
- *date.value = icaltime_from_timet (t, FALSE, FALSE);
+ *date.value = icaltime_from_timet (t, FALSE, TRUE);
cal_component_set_due (comp, &date);
} else {
cal_component_set_due (comp, NULL);
@@ -951,7 +951,7 @@ dialog_to_comp_object (TaskEditor *tedit)
/* Start Date. */
t = e_date_edit_get_time (E_DATE_EDIT (priv->start_date));
if (t != -1) {
- *date.value = icaltime_from_timet (t, FALSE, FALSE);
+ *date.value = icaltime_from_timet (t, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
} else {
cal_component_set_dtstart (comp, NULL);
@@ -960,7 +960,7 @@ dialog_to_comp_object (TaskEditor *tedit)
/* Completed Date. */
t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
if (t != -1) {
- *date.value = icaltime_from_timet (t, FALSE, FALSE);
+ *date.value = icaltime_from_timet (t, FALSE, TRUE);
cal_component_set_completed (comp, date.value);
} else {
cal_component_set_completed (comp, NULL);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 0d941caaff..861b2e04ad 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3024,10 +3024,10 @@ e_day_view_on_new_appointment (GtkWidget *widget, gpointer data)
date.value = &itt;
date.tzid = NULL;
- *date.value = icaltime_from_timet (dtstart, FALSE, FALSE);
+ *date.value = icaltime_from_timet (dtstart, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
- *date.value = icaltime_from_timet (dtend, FALSE, FALSE);
+ *date.value = icaltime_from_timet (dtend, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
cal_component_commit_sequence (comp);
@@ -3076,7 +3076,7 @@ e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
/* We must duplicate the CalComponent, or we won't know it has changed
when we get the "update_event" callback. */
comp = cal_component_clone (event->comp);
- cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE, FALSE));
+ cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE, TRUE));
if (!cal_client_update_object (day_view->client, comp))
g_message ("e_day_view_on_delete_occurrence(): Could not update the object!");
@@ -3135,7 +3135,7 @@ e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
instance. */
comp = cal_component_clone (event->comp);
- cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE, FALSE));
+ cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE, TRUE));
/* For the unrecurred instance we duplicate the original object,
create a new uid for it, get rid of the recurrence rules, and set
@@ -3150,9 +3150,9 @@ e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
date.value = &itt;
date.tzid = NULL;
- *date.value = icaltime_from_timet (event->start, FALSE, FALSE);
+ *date.value = icaltime_from_timet (event->start, FALSE, TRUE);
cal_component_set_dtstart (new_comp, &date);
- *date.value = icaltime_from_timet (event->end, FALSE, FALSE);
+ *date.value = icaltime_from_timet (event->end, FALSE, TRUE);
cal_component_set_dtend (new_comp, &date);
/* Now update both CalComponents. Note that we do this last since at
@@ -3678,11 +3678,11 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {
dt = day_view->day_starts[day_view->resize_start_row];
- *date.value = icaltime_from_timet (dt, FALSE, 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 = icaltime_from_timet (dt, FALSE, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
}
@@ -3724,11 +3724,11 @@ e_day_view_finish_resize (EDayView *day_view)
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 = icaltime_from_timet (dt, FALSE, 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 = icaltime_from_timet (dt, FALSE, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
}
@@ -4783,10 +4783,10 @@ e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
dt.value = &itt;
dt.tzid = NULL;
- *dt.value = icaltime_from_timet (dtstart, FALSE, FALSE);
+ *dt.value = icaltime_from_timet (dtstart, FALSE, TRUE);
cal_component_set_dtstart (comp, &dt);
- *dt.value = icaltime_from_timet (dtend, FALSE, FALSE);
+ *dt.value = icaltime_from_timet (dtend, FALSE, TRUE);
cal_component_set_dtend (comp, &dt);
/* We add the event locally and start editing it. When we get the
@@ -6297,13 +6297,13 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
date.tzid = NULL;
dt = day_view->day_starts[day] + start_offset * 60;
- *date.value = icaltime_from_timet (dt, FALSE, 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 = icaltime_from_timet (dt, FALSE, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
gtk_drag_finish (context, TRUE, TRUE, time);
@@ -6401,10 +6401,10 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget,
date.tzid = NULL;
dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;
- *date.value = icaltime_from_timet (dt, FALSE, 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 = icaltime_from_timet (dt, FALSE, FALSE);
+ *date.value = icaltime_from_timet (dt, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
gtk_drag_finish (context, TRUE, TRUE, time);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index a6d42b8bbd..916034991b 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3127,9 +3127,9 @@ e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
date.value = &itt;
date.tzid = NULL;
- *date.value = icaltime_from_timet (dtstart, FALSE, FALSE);
+ *date.value = icaltime_from_timet (dtstart, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
- *date.value = icaltime_from_timet (dtend, FALSE, FALSE);
+ *date.value = icaltime_from_timet (dtend, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
/* We add the event locally and start editing it. When we get the
@@ -3242,11 +3242,11 @@ e_week_view_on_new_appointment (GtkWidget *widget, gpointer data)
date.tzid = NULL;
dt = week_view->day_starts[week_view->selection_start_day];
- *date.value = icaltime_from_timet (dt, TRUE, FALSE);
+ *date.value = icaltime_from_timet (dt, TRUE, TRUE);
cal_component_set_dtstart (comp, &date);
dt = week_view->day_starts[week_view->selection_end_day + 1];
- *date.value = icaltime_from_timet (dt, TRUE, FALSE);
+ *date.value = icaltime_from_timet (dt, TRUE, TRUE);
cal_component_set_dtend (comp, &date);
cal_component_commit_sequence (comp);
@@ -3300,7 +3300,7 @@ e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
when we get the "update_event" callback. */
comp = cal_component_clone (event->comp);
- cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE, FALSE));
+ cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE, TRUE));
if (!cal_client_update_object (week_view->client, comp))
g_message ("e_week_view_on_delete_occurrence(): Could not update the object!");
@@ -3356,7 +3356,7 @@ e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
/* For the recurring object, we add a exception to get rid of the
instance. */
comp = cal_component_clone (event->comp);
- cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE, FALSE));
+ cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE, TRUE));
/* For the unrecurred instance we duplicate the original object,
create a new uid for it, get rid of the recurrence rules, and set
@@ -3371,9 +3371,9 @@ e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
date.value = &itt;
date.tzid = NULL;
- *date.value = icaltime_from_timet (event->start, TRUE, FALSE);
+ *date.value = icaltime_from_timet (event->start, TRUE, TRUE);
cal_component_set_dtstart (new_comp, &date);
- *date.value = icaltime_from_timet (event->end, TRUE, FALSE);
+ *date.value = icaltime_from_timet (event->end, TRUE, TRUE);
cal_component_set_dtend (new_comp, &date);
/* Now update both CalComponents. Note that we do this last since at
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index 85dc3025ef..6f30b45797 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -2155,7 +2155,7 @@ simple_recur_to_comp_object (EventEditor *ee, CalComponent *comp)
r.until = icaltime_from_timet (
e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_ending_date_edit)),
- TRUE, FALSE);
+ TRUE, TRUE);
break;
case ENDING_FOREVER:
@@ -2224,7 +2224,7 @@ recur_to_comp_object (EventEditor *ee, CalComponent *comp)
cdt->tzid = NULL;
tim = gtk_clist_get_row_data (exception_list, i);
- *cdt->value = icaltime_from_timet (*tim, FALSE, FALSE);
+ *cdt->value = icaltime_from_timet (*tim, FALSE, TRUE);
list = g_slist_prepend (list, cdt);
}
@@ -2289,7 +2289,7 @@ dialog_to_comp_object (EventEditor *ee, CalComponent *comp)
t = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
if (t != -1) {
- *date.value = icaltime_from_timet (t, FALSE, FALSE);
+ *date.value = icaltime_from_timet (t, FALSE, TRUE);
cal_component_set_dtstart (comp, &date);
} else {
/* FIXME: What do we do here? */
@@ -2303,7 +2303,7 @@ dialog_to_comp_object (EventEditor *ee, CalComponent *comp)
if (all_day_event)
t = time_day_end (t);
- *date.value = icaltime_from_timet (t, FALSE, FALSE);
+ *date.value = icaltime_from_timet (t, FALSE, TRUE);
cal_component_set_dtend (comp, &date);
} else {
/* FIXME: What do we do here? */
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index bbc0e0e1b9..e64ecbe706 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1804,10 +1804,10 @@ gnome_calendar_new_appointment (GnomeCalendar *gcal)
comp = cal_component_new ();
cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
- itt = icaltime_from_timet (dtstart, FALSE, FALSE);
+ itt = icaltime_from_timet (dtstart, FALSE, TRUE);
cal_component_set_dtstart (comp, &dt);
- itt = icaltime_from_timet (dtend, FALSE, FALSE);
+ itt = icaltime_from_timet (dtend, FALSE, TRUE);
cal_component_set_dtend (comp, &dt);
cal_component_commit_sequence (comp);