From 1c53c9d8c369d228c0fd0314b9915d218b5f5dca Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <calcurse@cryptocrack.de>
Date: Sun, 1 Jul 2012 22:51:44 +0200
Subject: Revise todo_delete_note_bynum()
Pass an item instead of passing a list item index (analogous to commit
02c90ba53a658686bad5cb5f88c555d9eef06399).
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
---
src/calcurse.h | 2 +-
src/interaction.c | 2 +-
src/todo.c | 8 +-------
3 files changed, 3 insertions(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/calcurse.h b/src/calcurse.h
index 1fd6010..714852e 100644
--- a/src/calcurse.h
+++ b/src/calcurse.h
@@ -905,7 +905,7 @@ int todo_hilt_pos(void);
char *todo_saved_mesg(void);
struct todo *todo_add(char *, int, char *);
void todo_write(struct todo *, FILE *);
-void todo_delete_note_bynum(unsigned);
+void todo_delete_note(struct todo *);
void todo_delete(struct todo *);
void todo_flag(struct todo *);
void todo_chg_priority(struct todo *, int);
diff --git a/src/interaction.c b/src/interaction.c
index 829e778..feff4d8 100644
--- a/src/interaction.c
+++ b/src/interaction.c
@@ -684,7 +684,7 @@ void interact_todo_delete(void)
todo_first_decrease(1);
break;
case 2:
- todo_delete_note_bynum(todo_hilt() - 1);
+ todo_delete_note(todo_get_item(todo_hilt()));
break;
default:
wins_erase_status_bar();
diff --git a/src/todo.c b/src/todo.c
index 191a2ac..ae5a81e 100644
--- a/src/todo.c
+++ b/src/todo.c
@@ -156,14 +156,8 @@ void todo_write(struct todo *todo, FILE * f)
}
/* Delete a note previously attached to a todo item. */
-void todo_delete_note_bynum(unsigned num)
+void todo_delete_note(struct todo *todo)
{
- llist_item_t *i = LLIST_NTH(&todolist, num);
-
- if (!i)
- EXIT(_("no such todo"));
- struct todo *todo = LLIST_TS_GET_DATA(i);
-
if (!todo->note)
EXIT(_("no note attached"));
erase_note(&todo->note);
--
cgit v1.2.3-70-g09d2