From 1bd22eb65b2d1fa1cb8a589871337290c1cb258f Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 12 Oct 2001 22:09:57 +0000 Subject: return fill_component success 2001-10-12 JP Rosevear * gui/dialogs/alarm-page.c: return fill_component success * gui/dialogs/task-page.c: ditto * gui/dialogs/task-details-page.c: ditto * gui/dialogs/schedule-page.c: ditto * gui/dialogs/recurrence-page.c: ditto * gui/dialogs/event-page.c: ditto * gui/dialogs/meeting-page.c: use e_notice instead of duplicate_error (meeting_page_get_cancel_comp): duh, deleted_attendees is an array now (meeting_page_fill_component): spew gui errors if there is no organizer or no attendees, return success * gui/dialogs/event-editor.c (event_editor_send_comp): always call parent method and don't send the cancellation comp if the method is publish (refresh_meeting_cmd): use the orginal comp to refresh (forward_cmd): prompt the user for the version they want to send (current, original) * gui/dialogs/task-editor.c (forward_cmd): as above (refresh_task_cmd): ditto * gui/dialogs/comp-editor-page.c (comp_editor_page_fill_component): return boolean of whether the component could be filled or not * gui/dialogs/comp-editor-page.h: update proto * gui/dialogs/comp-editor.c (prompt_to_save_changes): take a param on whether to try and send or not (comp_editor_get_current_comp): only fill component if its changed (comp_editor_save_comp): prompt user as well * gui/dialogs/comp-editor.h: change proto * gui/itip-utils.c: replace error_dialog with e_notice (comp_content_type): specify charset svn path=/trunk/; revision=13635 --- calendar/gui/dialogs/alarm-page.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'calendar/gui/dialogs/alarm-page.c') diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c index 649a86f025..0824f410c5 100644 --- a/calendar/gui/dialogs/alarm-page.c +++ b/calendar/gui/dialogs/alarm-page.c @@ -119,7 +119,7 @@ static void alarm_page_destroy (GtkObject *object); static GtkWidget *alarm_page_get_widget (CompEditorPage *page); static void alarm_page_focus_main_widget (CompEditorPage *page); static void alarm_page_fill_widgets (CompEditorPage *page, CalComponent *comp); -static void alarm_page_fill_component (CompEditorPage *page, CalComponent *comp); +static gboolean alarm_page_fill_component (CompEditorPage *page, CalComponent *comp); static void alarm_page_set_summary (CompEditorPage *page, const char *summary); static void alarm_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates); @@ -359,9 +359,7 @@ get_alarm_string (CalComponentAlarm *alarm) CalAlarmAction action; CalAlarmTrigger trigger; char string[256]; - char *base; - char *str; - char *dur; + char *base, *str = NULL, *dur; string [0] = '\0'; @@ -536,7 +534,7 @@ alarm_page_fill_widgets (CompEditorPage *page, CalComponent *comp) } /* fill_component handler for the alarm page */ -static void +static gboolean alarm_page_fill_component (CompEditorPage *page, CalComponent *comp) { AlarmPage *apage; @@ -576,6 +574,8 @@ alarm_page_fill_component (CompEditorPage *page, CalComponent *comp) cal_component_add_alarm (comp, alarm_copy); cal_component_alarm_free (alarm_copy); } + + return TRUE; } /* set_summary handler for the alarm page */ -- cgit v1.2.3