From 03b231a20b0e2e1bdfc422ff713127b34e4cce19 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 27 Jun 2001 00:12:28 +0000 Subject: Renamed the occur field to occur_start; added an occur_end field. This way 2001-06-26 Federico Mena Quintero * idl/evolution-calendar.idl (CalAlarmInstance): Renamed the occur field to occur_start; added an occur_end field. This way we can present the complete times for the occurrence from the server. * cal-util/cal-component.h (CalAlarmInstance): Likewise. * pcs/cal-backend-file.c (add_alarm_occurrences_cb): Fill the new fields appropriately. (generate_absolute_triggers): Likewise; we use -1 in case the component has no DTSTART or DTEND because there are no meaningful occurrence dates here. (fill_alarm_instances_seq): Fill in the new fields. * cal-client/cal-client.c (build_alarm_instance_list): Likewise. * gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog): Take in both the occur_start and occur_end times. * gui/goto.c (goto_dialog): Free the dlg structure on the bail-out cases. * gui/dialogs/event-page.c (get_widgets): Do not assert if we cannot find the main widget; just return FALSE. * gui/dialogs/alarm-page.c (get_widgets): Likewise. * gui/dialogs/task-page.c (get_widgets): Likewise. * gui/dialogs/task-details-page.c (get_widgets): Likewise. * gui/dialogs/meeting-page.c (get_widgets): Likewise. svn path=/trunk/; revision=10517 --- calendar/gui/dialogs/alarm-page.c | 4 +++- calendar/gui/dialogs/event-page.c | 4 +++- calendar/gui/dialogs/meeting-page.c | 4 +++- calendar/gui/dialogs/recurrence-page.c | 4 +++- calendar/gui/dialogs/task-details-page.c | 4 +++- calendar/gui/dialogs/task-page.c | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c index 74e728ad4c..9a92b5c9a2 100644 --- a/calendar/gui/dialogs/alarm-page.c +++ b/calendar/gui/dialogs/alarm-page.c @@ -562,7 +562,9 @@ get_widgets (AlarmPage *apage) #define GW(name) glade_xml_get_widget (priv->xml, name) priv->main = GW ("alarm-page"); - g_assert (priv->main); + if (!priv->main) + return FALSE; + gtk_widget_ref (priv->main); gtk_widget_unparent (priv->main); diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 93d9b65e14..5646a31a76 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -534,7 +534,9 @@ get_widgets (EventPage *epage) #define GW(name) glade_xml_get_widget (priv->xml, name) priv->main = GW ("event-page"); - g_assert (priv->main); + if (!priv->main) + return FALSE; + gtk_widget_ref (priv->main); gtk_widget_unparent (priv->main); diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index 7932fbd177..fddaab1900 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -373,7 +373,9 @@ get_widgets (MeetingPage *mpage) #define GW(name) glade_xml_get_widget (priv->xml, name) priv->main = GW ("meeting-page"); - g_assert (priv->main); + if (!priv->main) + return FALSE; + gtk_widget_ref (priv->main); gtk_widget_unparent (priv->main); diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index c5c45def15..e1656ad83f 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -1747,7 +1747,9 @@ get_widgets (RecurrencePage *rpage) #define GW(name) glade_xml_get_widget (priv->xml, name) priv->main = GW ("recurrence-page"); - g_assert (priv->main); + if (!priv->main) + return FALSE; + gtk_widget_ref (priv->main); gtk_widget_unparent (priv->main); diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 76a3cadcd4..2e4a5ddab1 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -320,7 +320,9 @@ get_widgets (TaskDetailsPage *tdpage) #define GW(name) glade_xml_get_widget (priv->xml, name) priv->main = GW ("task-details-page"); - g_assert (priv->main); + if (!priv->main) + return FALSE; + gtk_widget_ref (priv->main); gtk_widget_unparent (priv->main); diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 02a1e1bfd3..ce01a389e6 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -618,7 +618,9 @@ get_widgets (TaskPage *tpage) #define GW(name) glade_xml_get_widget (priv->xml, name) priv->main = GW ("task-page"); - g_assert (priv->main); + if (!priv->main) + return FALSE; + gtk_widget_ref (priv->main); gtk_widget_unparent (priv->main); -- cgit v1.2.3