diff options
Diffstat (limited to 'calendar/gui/e-cal-model.c')
| -rw-r--r-- | calendar/gui/e-cal-model.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index ca0f16a4ba..872ace383d 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -1301,12 +1301,7 @@ set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone) start_time = icalcomponent_get_dtstart (comp_data->icalcomp); end_time = icalcomponent_get_dtend (comp_data->icalcomp); - if (e_cal_util_component_is_instance (comp_data->icalcomp)) { - itt = icaltime_convert_to_zone (recur_time, icaltimezone_get_utc_timezone ()); - comp_data->instance_start = icaltime_as_timet (itt); - } else { - comp_data->instance_start = icaltime_as_timet (start_time); - } + comp_data->instance_start = icaltime_as_timet (start_time); comp_data->instance_end = comp_data->instance_start + (icaltime_as_timet (end_time) - icaltime_as_timet (start_time)); @@ -1324,17 +1319,17 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data for (l = objects; l; l = l->next) { ECalModelComponent *comp_data; - /* remove the components if they are already present and re-add them */ - while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query), - icalcomponent_get_uid (l->data)))) { - int pos; +/* /\* remove the components if they are already present and re-add them *\/ */ +/* while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query), */ +/* icalcomponent_get_uid (l->data)))) { */ +/* int pos; */ - pos = get_position_in_array (priv->objects, comp_data); - e_table_model_row_deleted (E_TABLE_MODEL (model), pos); +/* pos = get_position_in_array (priv->objects, comp_data); */ +/* e_table_model_row_deleted (E_TABLE_MODEL (model), pos); */ - g_ptr_array_remove (priv->objects, comp_data); - e_cal_model_free_component_data (comp_data); - } +/* g_ptr_array_remove (priv->objects, comp_data); */ +/* e_cal_model_free_component_data (comp_data); */ +/* } */ if ((priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) { RecurrenceExpansionData rdata; |