aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/gui/e-cal-view.c2
-rw-r--r--calendar/gui/e-calendar-view.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fed82ace52..83e06e7bbb 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,9 @@
2003-07-24 Rodrigo Moya <rodrigo@ximian.com>
+ * gui/e-cal-view.c (delete_event): check the uid before using it.
+
+2003-07-24 Rodrigo Moya <rodrigo@ximian.com>
+
* gui/e-day-view.c (e_day_view_delete_event,
e_day_view_delete_event_internal):
* gui/e-week-view.c (e_week_view_delete_event,
diff --git a/calendar/gui/e-cal-view.c b/calendar/gui/e-cal-view.c
index 6c352270af..84dab61a86 100644
--- a/calendar/gui/e-cal-view.c
+++ b/calendar/gui/e-cal-view.c
@@ -593,6 +593,8 @@ delete_event (ECalView *cal_view, CalComponent *comp)
cal_view->priv->client, NULL);
cal_component_get_uid (comp, &uid);
+ if (!uid || !*uid)
+ return;
delete_error_dialog (
cal_client_remove_object (cal_view->priv->client, uid), CAL_COMPONENT_EVENT);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 6c352270af..84dab61a86 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -593,6 +593,8 @@ delete_event (ECalView *cal_view, CalComponent *comp)
cal_view->priv->client, NULL);
cal_component_get_uid (comp, &uid);
+ if (!uid || !*uid)
+ return;
delete_error_dialog (
cal_client_remove_object (cal_view->priv->client, uid), CAL_COMPONENT_EVENT);