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

Simplify apoint_switch_notify()

Browse Source 
Pull out code from apoint_switch_notify() -- especially the fallback
routine that calls recur_apoint_switch_notify() if the currently
selected item is a recurrent item -- and move it to a wrapper function
day_item_switch_notify().

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2012-06-25 22:30:20 +02:00
parent b97c2a09cf
commit 0504875219
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/apoint.c
View File

@@ -547,34 +547,13 @@ struct notify_app *apoint_check_next(struct notify_app *app, long start)
/*
* Switch notification state.
*/
void apoint_switch_notify(void)
void apoint_switch_notify(struct apoint *apt)
{
struct day_item *p;
long date;
int apoint_nb = 0, need_chk_notify;
p = day_get_item(hilt);
if (p->type != APPT && p->type != RECUR_APPT)
return;
date = calendar_get_slctd_day_sec();
if (p->type == RECUR_APPT) {
recur_apoint_switch_notify(p->item.rapt);
return;
} else if (p->type == APPT)
apoint_nb = day_item_nb(date, hilt, APPT);
need_chk_notify = 0;
LLIST_TS_LOCK(&alist_p);
struct apoint *apt = apoint_get(date, apoint_nb);
apt->state ^= APOINT_NOTIFY;
if (notify_bar())
notify_check_added(apt->mesg, apt->start, apt->state);
if (need_chk_notify)
notify_check_next_app(0);
LLIST_TS_UNLOCK(&alist_p);
}