Merge branch 'maint'

This commit is contained in:
Lukas Fleischer
2011-07-30 22:56:22 +02:00
6 changed files with 120 additions and 76 deletions

View File

@@ -781,6 +781,7 @@ day_edit_item (struct conf *conf)
struct apoint *a;
long date;
int item_num, ch;
int need_check_notify = 0;
item_num = apoint_hilt ();
p = day_get_item (item_num);
@@ -820,15 +821,19 @@ day_edit_item (struct conf *conf)
switch (ch)
{
case STRT:
need_check_notify = 1;
update_start_time (&ra->start, &ra->dur);
break;
case END:
update_duration (&ra->start, &ra->dur);
break;
case DESC:
if (notify_bar ())
need_check_notify = notify_same_recur_item (ra);
update_desc (&ra->mesg);
break;
case REPT:
need_check_notify = 1;
update_rept (&ra->rpt, ra->start, conf);
break;
case KEY_GENERIC_CANCEL:
@@ -844,12 +849,15 @@ day_edit_item (struct conf *conf)
switch (ch)
{
case STRT:
need_check_notify = 1;
update_start_time (&a->start, &a->dur);
break;
case END:
update_duration (&a->start, &a->dur);
break;
case DESC:
if (notify_bar ())
need_check_notify = notify_same_item (a->start);
update_desc (&a->mesg);
break;
case KEY_GENERIC_CANCEL:
@@ -857,6 +865,9 @@ day_edit_item (struct conf *conf)
}
break;
}
if (need_check_notify)
notify_check_next_app (1);
}
/*