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

recur_apoint_check_next() and recur_repeat_item() updated

Browse Source
This commit is contained in:
Frederic Culot 2006-09-16 15:23:05 +00:00
parent 9c8c943c6d
commit 730e1d9df5
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/recur.c
View File

@ -1,4 +1,4 @@
/* $calcurse: recur.c,v 1.12 2006/09/14 14:57:06 culot Exp $ */ /* $calcurse: recur.c,v 1.13 2006/09/16 15:23:05 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -460,7 +460,8 @@ void recur_apoint_erase(long start, unsigned num, unsigned delete_whole)
if (recur_item_inday(i->start, i->exc, i->rpt->type, if (recur_item_inday(i->start, i->exc, i->rpt->type,
i->rpt->freq, i->rpt->until, start)) { i->rpt->freq, i->rpt->until, start)) {
if (n == num) { if (n == num) {
need_check_notify = notify_same_recur_item(i); if (notify_bar())
need_check_notify = notify_same_recur_item(i);
if (delete_whole) { if (delete_whole) {
*iptr = i->next; *iptr = i->next;
free(i->mesg); free(i->mesg);
@ -612,7 +613,7 @@ void recur_repeat_item(int sel_year, int sel_month, int sel_day,
} else if (p->type == APPT) { } else if (p->type == APPT) {
ra = recur_apoint_new(p->mesg, p->start, p->appt_dur, ra = recur_apoint_new(p->mesg, p->start, p->appt_dur,
type, freq, until, NULL); type, freq, until, NULL);
notify_check_repeated(ra); if (notify_bar()) notify_check_repeated(ra);
} else { /* NOTREACHED */ } else { /* NOTREACHED */
fputs(_("FATAL ERROR in recur_repeat_item: wrong item type\n"), fputs(_("FATAL ERROR in recur_repeat_item: wrong item type\n"),
stderr); stderr);
@ -676,14 +677,7 @@ struct notify_app_s *recur_apoint_check_next(
i->rpt->until, day); i->rpt->until, day);
if (real_recur_start_time > start) { if (real_recur_start_time > start) {
app->time = real_recur_start_time; app->time = real_recur_start_time;
if (strlen(i->mesg) < NOTIFY_FIELD_LENGTH) { app->txt = mycpy(i->mesg);
strncpy(app->txt, i->mesg,
strlen(i->mesg) + 1);
} else {
strncpy(app->txt, i->mesg,
NOTIFY_FIELD_LENGTH-3);
strncat(app->txt, "..", 2);
}
app->got_app = 1; app->got_app = 1;
} }
} }