day_erase_item() updated

This commit is contained in:
Frederic Culot 2006-08-02 21:20:19 +00:00
parent 489df669eb
commit 01c2c234a0

View File

@ -1,4 +1,4 @@
/* $calcurse: day.c,v 1.2 2006/08/01 20:35:44 culot Exp $ */ /* $calcurse: day.c,v 1.3 2006/08/02 21:20:19 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -371,6 +371,7 @@ int day_erase_item(long date, int item_number) {
int i; int i;
int ch = 0; int ch = 0;
int nb_item[MAX_TYPES - 1]; int nb_item[MAX_TYPES - 1];
unsigned delete_whole;
struct day_item_s *p; struct day_item_s *p;
char *erase_warning = char *erase_warning =
_("This item is recurrent. " _("This item is recurrent. "
@ -387,25 +388,31 @@ int day_erase_item(long date, int item_number) {
p = p->next; p = p->next;
} }
switch (p->type) { if (p->type == EVNT) {
case RECUR_EVNT: event_delete_bynum(date, nb_item[EVNT - 1]);
case RECUR_APPT: } else if (p->type == APPT) {
while ( (ch != 'a') && (ch != 'o')) { apoint_delete_bynum(date, nb_item[APPT - 1]);
} else {
while ( (ch != 'a') && (ch != 'o') && (ch != ESCAPE)) {
status_mesg(erase_warning, erase_choice); status_mesg(erase_warning, erase_choice);
ch = wgetch(swin); ch = wgetch(swin);
} }
if (ch == 'a') { if (ch == 'a') {
delete_whole = 1;
} else if (ch == 'o') { } else if (ch == 'o') {
delete_whole = 0;
} else {
return 0;
} }
break;
case EVNT: if (p->type == RECUR_EVNT) {
event_delete_bynum(date, nb_item[EVNT - 1]); recur_event_erase(date, nb_item[RECUR_EVNT - 1],
break; delete_whole);
} else {
case APPT: recur_apoint_erase(date, nb_item[RECUR_APPT - 1],
apoint_delete_bynum(date, nb_item[APPT - 1]); delete_whole);
break; }
} }
return p->type; return p->type;