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

Simplify recur_apoint_switch_notify()

Browse Source 
Pass the recurrent appointment itself instead of passing a date and an
item number. This is quite simple as we can just pass the pointer that
is contained in the generic item structure and don't have to
LLIST_TS_FIND_*() the item first any more.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2012-06-25 12:04:45 +02:00
parent 52bfc54333
commit 80e24954c2
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apoint.c
View File

@ -560,7 +560,7 @@ void apoint_switch_notify(void)
date = calendar_get_slctd_day_sec();
if (p->type == RECUR_APPT) {
recur_apoint_switch_notify(date, p->appt_pos);
recur_apoint_switch_notify(p->item.rapt);
return;
} else if (p->type == APPT)
apoint_nb = day_item_nb(date, hilt, APPT);

2
src/calcurse.h
View File

@ -865,7 +865,7 @@ void recur_exc_scan(llist_t *, FILE *);
struct notify_app *recur_apoint_check_next(struct notify_app *, long, long);
struct recur_apoint *recur_get_apoint(long, int);
struct recur_event *recur_get_event(long, int);
void recur_apoint_switch_notify(long, int);
void recur_apoint_switch_notify(struct recur_apoint *);
void recur_event_paste_item(void);
void recur_apoint_paste_item(void);

10
src/recur.c
View File

@ -1005,19 +1005,11 @@ struct recur_event *recur_get_event(long date, int num)
}
/* Switch recurrent item notification state. */
void recur_apoint_switch_notify(long date, int recur_nb)
void recur_apoint_switch_notify(struct recur_apoint *rapt)
{
llist_item_t *i;
LLIST_TS_LOCK(&recur_alist_p);
i = LLIST_TS_FIND_NTH(&recur_alist_p, recur_nb, date, recur_apoint_inday);
if (!i)
EXIT(_("item not found"));
struct recur_apoint *rapt = LLIST_TS_GET_DATA(i);
rapt->state ^= APOINT_NOTIFY;
if (notify_bar())
notify_check_repeated(rapt);