From d509f47a95ddc37b4ee566eb5980c27f6626c8dc Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 11 May 2000 17:31:30 +0000 Subject: Removed unused arguments. Load the initial alarms here. (load_alarms): New 2000-05-11 Federico Mena Quintero * gui/gnome-cal.c (gnome_calendar_update_all): Removed unused arguments. Load the initial alarms here. (load_alarms): New function to load a day's worth of alarms. (gnome_calendar_class_init): Eeeek! This was taking in an incorrect argument type. (gnome_calendar_init): Now the calendar keeps a hash table of UIDs->queued alarms. Create the hash table here. (gnome_calendar_destroy): Destroy the alarms hash table. (gnome_calendar_object_updated_cb): Remove the alarms for the object and regenerate them. (gnome_calendar_object_removed_cb): Remove the alarms for the object. * gui/alarm.c (alarm_add): Do not take in a CalendarAlarm, just the trigger time, the callback and the closure data. Return an opaque identifier for the alarm so that it can be removed by the client code if needed. Use the queue_alarm() helper function. (queue_alarm): Helper function to actually queue the alarm and set up the itimer. Deal with a nonzero return value from setitimer(). (alarm_remove): New function to remove an alarm based on its ID. (pop_alarm): New helper function; pops the first alarm of the queue and resets the timer as appropriate. (alarm_ready): Simplified a lot by using pop_alarm(). * idl/evolution-calendar.idl (Cal): Added get_alarms_in_range(). * pcs/cal.c (build_instance_seq): New function to build a CORBA sequence from the internal list of instances. (Cal_get_events_in_range): Use build_instance_seq(). (Cal_get_alarms_in_range): Implemented new method. * pcs/cal-backend.c (cal_backend_get_alarms_in_range): New function with the get_alarms_in_range() engine. * pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_in_range): Implemented the get_alarms_in_range() method. * cal-client/cal-client.c (cal_client_get_alarms_in_range): New client-side function for getting the alarms. (build_instance_list): New helper function to build the CalObjInstance list from the CORBA sequence. (cal_client_get_events_in_range): Use build_instance_list(). * gui/calendar-commands.h: #include . #include "gnome-cal.h". * gui/e-week-view.c: #include "calendar-commands.h" instead of main.h; the latter is an obsolete file and will be killed. * gui/evolution-calendar-control.c (main): Call init_bonobo() before anything else. We need the GTK+ object system initialized. * gui/Makefile.am (evolution_calendar_SOURCES): Do not use main.h. * cal-util/cal-util.c (cal_alarm_instance_list_free): New function. svn path=/trunk/; revision=2987 --- calendar/idl/evolution-calendar.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'calendar/idl/evolution-calendar.idl') diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl index eda35a3419..b08b8fd07f 100644 --- a/calendar/idl/evolution-calendar.idl +++ b/calendar/idl/evolution-calendar.idl @@ -34,6 +34,14 @@ module Calendar { const CalObjType TYPE_OTHER = 1 << 3; const CalObjType TYPE_ANY = 0x0f; + /* Types of alarms */ + enum AlarmType { + MAIL, + PROGRAM, + DISPLAY, + AUDIO + }; + /* Used to store a time_t */ typedef unsigned long Time_t; @@ -51,6 +59,16 @@ module Calendar { typedef sequence CalObjInstanceSeq; + /* An alarm trigger instance */ + struct CalAlarmInstance { + CalObjUID uid; + AlarmType type; + Time_t trigger; + Time_t occur; + }; + + typedef sequence CalAlarmInstanceSeq; + interface Listener; /* Calendar client interface */ @@ -73,6 +91,12 @@ module Calendar { CalObjInstanceSeq get_events_in_range (in Time_t start, in Time_t end) raises (InvalidRange); + /* Gets the objects whose alarms trigger in the specified time + * range. + */ + CalAlarmInstanceSeq get_alarms_in_range (in Time_t start, in Time_t end) + raises (InvalidRange); + /* Updates an object by adding it if it does not exist or by * changing an existing one. */ -- cgit v1.2.3