diff options
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/cal-util/calobj.c | 29 | ||||
| -rw-r--r-- | calendar/pcs/tlacuache.c | 21 |
3 files changed, 15 insertions, 45 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index b19c42ca32..ac1b4c9edc 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2000-03-10 Federico Mena Quintero <federico@helixcode.com> + + * cal-util/calobj.c (ical_new): Initialize the alarm types here. + Do not call default_alarm() anymore, since that is a GUI issue. + (default_alarm): Removed function. + (alarm_defaults): Removed defaults data. + + * pcs/tlacuache.c (calendar_notify): Removed stubs for + alarm_defaults, calendar_notify(), debug_alarms. + 2000-03-09 Federico Mena Quintero <federico@helixcode.com> * gui/Makefile.am: Removed the corba-cal stuff. Commented out the diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c index 0c9a9207bd..2aa8b434a8 100644 --- a/calendar/cal-util/calobj.c +++ b/calendar/cal-util/calobj.c @@ -15,13 +15,7 @@ #include "timeutil.h" #include "libversit/vcc.h" -/* Default values for alarms */ -CalendarAlarm alarm_defaults[4] = { - { ALARM_MAIL, 0, 15, ALARM_MINUTES }, - { ALARM_PROGRAM, 0, 15, ALARM_MINUTES }, - { ALARM_DISPLAY, 0, 15, ALARM_MINUTES }, - { ALARM_AUDIO, 0, 15, ALARM_MINUTES } -}; + static char * ical_gen_uid (void) @@ -67,19 +61,6 @@ ical_object_new (void) return ico; } -static void -default_alarm (iCalObject *ical, CalendarAlarm *alarm, char *def_mail, enum AlarmType type) -{ - alarm->type = type; - alarm->enabled = alarm_defaults[type].enabled; - alarm->count = alarm_defaults[type].count; - alarm->units = alarm_defaults[type].units; - if (alarm_defaults[type].data) - alarm->data = g_strdup (alarm_defaults[type].data); - else - alarm->data = g_strdup (""); -} - iCalObject * ical_new (char *comment, char *organizer, char *summary) { @@ -94,10 +75,10 @@ ical_new (char *comment, char *organizer, char *summary) ico->class = g_strdup ("PUBLIC"); ico->status = g_strdup ("NEEDS ACTION"); - default_alarm (ico, &ico->dalarm, organizer, ALARM_DISPLAY); - default_alarm (ico, &ico->palarm, organizer, ALARM_PROGRAM); - default_alarm (ico, &ico->malarm, organizer, ALARM_MAIL); - default_alarm (ico, &ico->aalarm, organizer, ALARM_AUDIO); + ico->dalarm.type = ALARM_DISPLAY; + ico->palarm.type = ALARM_PROGRAM; + ico->malarm.type = ALARM_MAIL; + ico->aalarm.type = ALARM_AUDIO; return ico; } diff --git a/calendar/pcs/tlacuache.c b/calendar/pcs/tlacuache.c index 35bb585862..f5dd3d233c 100644 --- a/calendar/pcs/tlacuache.c +++ b/calendar/pcs/tlacuache.c @@ -28,27 +28,6 @@ -/* Stuff that the un-converted alarm code needs to build */ - -int debug_alarms = FALSE; - -void calendar_notify (time_t time, CalendarAlarm *which, void *data); - -CalendarAlarm alarm_defaults[4] = { - { ALARM_MAIL, 0, 15, ALARM_MINUTES }, - { ALARM_PROGRAM, 0, 15, ALARM_MINUTES }, - { ALARM_DISPLAY, 0, 15, ALARM_MINUTES }, - { ALARM_AUDIO, 0, 15, ALARM_MINUTES } -}; - -void -calendar_notify (time_t time, CalendarAlarm *which, void *data) -{ - g_error ("calendar_notify() called!"); -} - - - /* Callback used when the calendar factory is destroyed */ static void factory_destroy_cb (GtkObject *object, gpointer data) |