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

Use status_ask_choice() where applicable

Browse Source 
These cases make obvious candidates for factorisation.

Signed-off-by: Baptiste Jonglez <baptiste--git@jonglez.org>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Baptiste Jonglez
2012-05-14 12:38:22 +02:00
committed by Lukas Fleischer
parent 4087cd4e5e
commit 1d9c90bb18
2 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/todo.c
View File

@@ -246,8 +246,9 @@ todo_delete (void)
const char *erase_warning =
_("This item has a note attached to it. "
"Delete (t)odo or just its (n)ote ?");
const char *erase_choice = _("[t/n] ");
int answer, has_note;
const char *erase_choice = _("[tn]");
const int nb_erase_choice = 2;
int answer;
if (conf.confirm_delete)
{
@@ -265,20 +266,15 @@ todo_delete (void)
return;
}
answer = -1;
has_note = (todo_get_item (hilt)->note != NULL) ? 1 : 0;
if (has_note == 0)
answer = 't';
while (answer != 't' && answer != 'n' && answer != KEY_GENERIC_CANCEL)
{
status_mesg (erase_warning, erase_choice);
answer = wgetch (win[STA].p);
}
/* This todo item doesn't have any note associated. */
if (todo_get_item (hilt)->note == NULL)
answer = 1;
else
answer = status_ask_choice (erase_warning, erase_choice, nb_erase_choice);
switch (answer)
{
case 't':
case 1:
todo_delete_bynum (hilt - 1);
todos--;
if (hilt > 1)
@@ -288,7 +284,7 @@ todo_delete (void)
if (hilt - first < 0)
first--;
break;
case 'n':
case 2:
todo_delete_note_bynum (hilt - 1);
break;
default: