diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/event-page.c | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/task-page.c | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7246943e2a..34c4a18180 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2004-06-04 JP Rosevear <jpr@novell.com> + + * 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 + 2004-06-03 Jeffrey Stedfast <fejj@novell.com> * conduits/calendar/calendar-conduit.c 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); |