diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-options.c | 21 |
2 files changed, 21 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ebbc696f88..a03ae43994 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2001-08-21 Federico Mena Quintero <federico@ximian.com> + + * gui/dialogs/alarm-options.c (alarm_to_palarm_widgets): Handle + the case where there is no attachment. Fixes bug #7257. + 2001-08-21 JP Rosevear <jpr@ximian.com> * gui/e-itip-control.c (write_html): strip the mailto bit for the diff --git a/calendar/gui/dialogs/alarm-options.c b/calendar/gui/dialogs/alarm-options.c index f94d146377..c1d152c341 100644 --- a/calendar/gui/dialogs/alarm-options.c +++ b/calendar/gui/dialogs/alarm-options.c @@ -255,17 +255,20 @@ alarm_to_palarm_widgets (Dialog *dialog, CalComponentAlarm *alarm) { struct icalattachtype *attach; CalComponentText description; - char *url; cal_component_alarm_get_attach (alarm, &attach); cal_component_alarm_get_description (alarm, &description); - url = icalattachtype_get_url (attach); + if (attach) { + char *url; - e_dialog_editable_set (dialog->palarm_program, url); - e_dialog_editable_set (dialog->palarm_args, description.value); + url = icalattachtype_get_url (attach); + e_dialog_editable_set (dialog->palarm_program, url); - icalattachtype_free (attach); + icalattachtype_free (attach); + } + + e_dialog_editable_set (dialog->palarm_args, description.value); } enum duration_units { @@ -541,6 +544,14 @@ dialog_to_alarm (Dialog *dialog, CalComponentAlarm *alarm) +/** + * alarm_options_dialog_run: + * @alarm: Alarm that is to be edited. + * + * Runs an alarm options dialog modally. + * + * Return value: TRUE if the dialog could be created, FALSE otherwise. + **/ gboolean alarm_options_dialog_run (CalComponentAlarm *alarm) { |