From ac94f697a5cf1842244984a4c1d2859118916aa2 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 8 Aug 2000 02:55:29 +0000 Subject: New function. (cal_component_get_icalcomponent): Ensure that the SEQUENCE 2000-08-07 Federico Mena Quintero * cal-util/cal-component.c (cal_component_clone): New function. (cal_component_get_icalcomponent): Ensure that the SEQUENCE property does not need incrementing. * gui/dialogs/alarm-notify-dialog.c (alarm_notify_dialog): Use CalComponent. Deal with an empty summary property. svn path=/trunk/; revision=4589 --- calendar/gui/dialogs/alarm-notify-dialog.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'calendar/gui/dialogs/alarm-notify-dialog.c') diff --git a/calendar/gui/dialogs/alarm-notify-dialog.c b/calendar/gui/dialogs/alarm-notify-dialog.c index 931ab0bfac..7d8357599c 100644 --- a/calendar/gui/dialogs/alarm-notify-dialog.c +++ b/calendar/gui/dialogs/alarm-notify-dialog.c @@ -20,10 +20,7 @@ */ #include -#include -#include -#include -#include +#include #include #include "alarm-notify-dialog.h" @@ -119,8 +116,11 @@ edit_clicked_cb (GtkWidget *widget, gpointer data) /** * alarm_notify_dialog: + * @trigger: Trigger time for the alarm. + * @occur: Occurrence time for the event. + * @comp: Calendar component object which corresponds to the alarm. * @func: Function to be called when a dialog action is invoked. - * @data: Closure data for @func. + * @func_data: Closure data for @func. * * Runs the alarm notification dialog. The specified @func will be used to * notify the client about result of the actions in the dialog. @@ -128,17 +128,19 @@ edit_clicked_cb (GtkWidget *widget, gpointer data) * Return value: TRUE on success, FALSE if the dialog could not be created. **/ gboolean -alarm_notify_dialog (time_t trigger, time_t occur, iCalObject *ico, +alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp, AlarmNotifyFunc func, gpointer func_data) { AlarmNotify *an; char buf[256]; struct tm tm_trigger; struct tm tm_occur; + CalComponentText summary; g_return_val_if_fail (trigger != -1, FALSE); g_return_val_if_fail (occur != -1, FALSE); - g_return_val_if_fail (ico != NULL, FALSE); + g_return_val_if_fail (comp != NULL, FALSE); + g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE); g_return_val_if_fail (func != NULL, FALSE); an = g_new0 (AlarmNotify, 1); @@ -191,7 +193,12 @@ alarm_notify_dialog (time_t trigger, time_t occur, iCalObject *ico, /* Summary */ - gtk_label_set_text (GTK_LABEL (an->summary), ico->summary); + cal_component_get_summary (comp, &summary); + + if (summary.value) + gtk_label_set_text (GTK_LABEL (an->summary), summary.value); + else + gtk_label_set_text (GTK_LABEL (an->summary), _("No summary available.")); /* Connect actions */ -- cgit v1.2.3