fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revise *_delete{,_bynum}()

Browse Source 
Always pass an item instead of passing a date and a index. This makes
use of the NULL callback that was added with one of the previous
patches.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2012-06-26 13:29:54 +02:00
parent e1fbee0071
commit 02c90ba53a
7 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/interaction.c
View File

@@ -403,9 +403,9 @@ static int day_erase_item(long date, int item_number, enum eraseflg flag)
}
}
if (p->type == EVNT) {
event_delete_bynum(date, day_item_nb(date, item_number, EVNT), flag);
event_delete(p->item.ev, flag);
} else if (p->type == APPT) {
apoint_delete_bynum(date, day_item_nb(date, item_number, APPT), flag);
apoint_delete(p->item.apt, flag);
} else {
if (flag == ERASE_FORCE_ONLY_NOTE)
ans = 1;
@@ -424,10 +424,9 @@ static int day_erase_item(long date, int item_number, enum eraseflg flag)
}
if (p->type == RECUR_EVNT) {
recur_event_erase(date, day_item_nb(date, item_number, RECUR_EVNT),
delete_whole, flag);
recur_event_erase(p->item.rev, date, delete_whole, flag);
} else {
recur_apoint_erase(date, p->appt_pos, delete_whole, flag);
recur_apoint_erase(p->item.rapt, date, delete_whole, flag);
}
}
if (flag == ERASE_FORCE_ONLY_NOTE)
@@ -666,7 +665,7 @@ void interact_todo_delete(void)
switch (answer) {
case 1:
todo_delete_bynum(todo_hilt() - 1);
todo_delete(todo_get_item(todo_hilt()));
todo_set_nb(todo_nb() - 1);
if (todo_hilt() > 1)
todo_hilt_decrease(1);