From d9cb73cf7eec91a0ee784d98b7995c970c7c74d8 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 4 Jun 2004 15:09:29 +0000 Subject: guard against the text value being NULL 2004-06-04 JP Rosevear * gui/dialogs/task-page.c (task_page_fill_widgets): guard against the text value being NULL * gui/dialogs/event-page.c (event_page_fill_widgets): add guards here as well svn path=/trunk/; revision=26211 --- calendar/gui/dialogs/event-page.c | 8 +++++--- calendar/gui/dialogs/task-page.c | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index a367396b93..cd7bbe12ce 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -445,10 +445,12 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) e_dialog_editable_set (priv->location, location); e_cal_component_get_description_list (comp, &l); - if (l) { - text = *(ECalComponentText *)l->data; + if (l && l->data) { + ECalComponentText *dtext; + + dtext = l->data; gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), - text.value, -1); + dtext->value ? dtext->value : "", -1); } e_cal_component_free_text_list (l); diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 0f234eeeea..0979397245 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -278,9 +278,11 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) e_cal_component_get_description_list (comp, &l); if (l && l->data) { - text = *(ECalComponentText *)l->data; + ECalComponentText *dtext; + + dtext = l->data; gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), - text.value, -1); + dtext->value ? dtext->value : "", -1); } else { gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), "", 0); -- cgit