diff options
author | Lukas Fleischer <calcurse@cryptocrack.de> | 2011-07-30 22:56:22 +0200 |
---|---|---|
committer | Lukas Fleischer <calcurse@cryptocrack.de> | 2011-07-30 22:56:22 +0200 |
commit | 0884d62b2282b3ff5936f8d36f7f8d77c504938d (patch) | |
tree | 5371793ff9e066f942ece617acd381c9a12b4f7d /src/apoint.c | |
parent | 6256183e1e8a7ba09e12b9216ecaa730bb1ec114 (diff) | |
parent | 13a41f8e0a722f4491ad6256718227e7161b5896 (diff) | |
download | calcurse-0884d62b2282b3ff5936f8d36f7f8d77c504938d.tar.gz calcurse-0884d62b2282b3ff5936f8d36f7f8d77c504938d.zip |
Merge branch 'maint'
Diffstat (limited to 'src/apoint.c')
-rw-r--r-- | src/apoint.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/apoint.c b/src/apoint.c index ab3fab5..6fd9e64 100644 --- a/src/apoint.c +++ b/src/apoint.c @@ -516,7 +516,7 @@ apoint_delete_bynum (long start, unsigned num, enum eraseflg flag) erase_note (&apt->note, flag); mem_free (apt); if (need_check_notify) - notify_check_next_app (); + notify_check_next_app (0); break; } @@ -657,13 +657,13 @@ apoint_switch_notify (void) need_chk_notify = 0; LLIST_TS_LOCK (&alist_p); - struct apoint *apt = apoint_get (apoint_nb, date); + 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 (); + notify_check_next_app (0); LLIST_TS_UNLOCK (&alist_p); } @@ -729,5 +729,9 @@ apoint_paste_item (void) (void)apoint_new (bkp_cut_apoint.mesg, bkp_cut_apoint.note, bkp_start, bkp_cut_apoint.dur, bkp_cut_apoint.state); + + if (notify_bar ()) + notify_check_added (bkp_cut_apoint.mesg, bkp_start, bkp_cut_apoint.state); + apoint_free_bkp (ERASE_FORCE_KEEP_NOTE); } |