aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/dialogs/send-comp.c2
-rw-r--r--calendar/gui/e-cal-model.c5
-rw-r--r--calendar/gui/e-calendar-view.c2
-rw-r--r--calendar/gui/e-tasks.c2
5 files changed, 13 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c5407bcbf1..44f4e3fb08 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
2005-02-04 Rodrigo Moya <rodrigo@novell.com>
+ * gui/e-tasks.c (update_view): clear the component preview when we
+ update the view.
+
+ * gui/e-cal-model.c (set_instance_times): use the correct timezone.
+ Removed commented code.
+
+2005-02-04 Rodrigo Moya <rodrigo@novell.com>
+
Fixes #71265
* gui/e-week-view.c (e_week_view_remove_event_cb):
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index bc5ce3a35e..c5269f1854 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -102,5 +102,3 @@ send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *c
else
return FALSE;
}
-
-
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 3dd68d2111..6139b3ee52 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1303,20 +1303,19 @@ set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone)
if (zone) {
if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
- comp_data->instance_start = icaltime_as_timet_with_zone (recur_time, zone);
+ comp_data->instance_start = icaltime_as_timet_with_zone (recur_time,
+ start_time.zone ? start_time.zone : zone);
comp_data->instance_end = comp_data->instance_start +
(icaltime_as_timet_with_zone (end_time, end_time.zone ? end_time.zone : zone) -
icaltime_as_timet_with_zone (start_time, start_time.zone ? start_time.zone : zone));
} else {
if (start_time.zone) {
- //icaltimezone_convert_time (&start_time, start_time.zone, zone);
comp_data->instance_start = icaltime_as_timet_with_zone (start_time, start_time.zone);
} else
comp_data->instance_start = icaltime_as_timet_with_zone (start_time, zone);
if (end_time.zone) {
- //icaltimezone_convert_time (&end_time, end_time.zone, zone);
comp_data->instance_end = icaltime_as_timet_with_zone (end_time, end_time.zone);
} else
comp_data->instance_end = icaltime_as_timet_with_zone (end_time, zone);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 0ca92240d0..6c03060dda 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -830,7 +830,7 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
g_object_unref (comp);
return;
}
-
+
e_cal_remove_object (event->comp_data->client, uid, &error);
delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
g_clear_error (&error);
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 068a9dac9e..9aaa939268 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -284,6 +284,8 @@ update_view (ETasks *tasks)
g_free (real_sexp);
} else
e_cal_model_set_search_query (model, priv->sexp);
+
+ e_cal_component_preview_clear (E_CAL_COMPONENT_PREVIEW (priv->preview));
}
static gboolean