[evolution] Bug 747751 - Do not display reminders for past events/tasks/memos by default ][

[Milan Crha <mcrha src gnome org>]

commit 93ee068ded2b1165ef0f94e8ac9f75e6812aa717
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jan 20 10:38:34 2017 +0100

    Bug 747751 - Do not display reminders for past events/tasks/memos by default ][

 src/calendar/alarm-notify/alarm-queue.c |   51 ++++++++++++++++++++++++++----
 src/calendar/alarm-notify/alarm.c       |    2 +-
 2 files changed, 45 insertions(+), 8 deletions(-)
---
diff --git a/src/calendar/alarm-notify/alarm-queue.c b/src/calendar/alarm-notify/alarm-queue.c
index 106e6f3..6ef2948 100644
--- a/src/calendar/alarm-notify/alarm-queue.c
+++ b/src/calendar/alarm-notify/alarm-queue.c
@@ -220,7 +220,7 @@ e_ctime (const time_t *timep)
                        g_ascii_isspace (buffer[next - 1][len - 1])))
                        len--;
 
-               buffer[next - 1][len - 1] = 0;
+               buffer[next - 1][len] = 0;
        }
 
        if (next >= G_N_ELEMENTS (buffer))
@@ -495,12 +495,6 @@ alarm_trigger_cb (gpointer alarm_id,
        if (!qa)
                return;
 
-       /* Skip non-snoozed passed reminders, if setup to do so */
-       if (!qa->snooze && qa->orig_trigger < (time (NULL) - (5 * 60)) &&
-           !config_data_get_allow_past_reminders ()) {
-               return;
-       }
-
        /* Decide what to do based on the alarm action.  We use the trigger that
         * is passed to us instead of the one from the instance structure
         * because this may be a snoozed alarm instead of an original
@@ -511,6 +505,49 @@ alarm_trigger_cb (gpointer alarm_id,
        if (!alarm)
                return;
 
+       /* Skip non-snoozed passed reminders, if setup to do so */
+       if (!qa->snooze && !config_data_get_allow_past_reminders ()) {
+               ECalComponentAlarmTrigger trigger;
+               ECalComponentAlarmRepeat repeat;
+               time_t offset = 0, event_relative, orig_trigger_day, today;
+
+               e_cal_component_alarm_get_trigger (alarm, &trigger);
+               e_cal_component_alarm_get_repeat (alarm, &repeat);
+
+               switch (trigger.type) {
+               case E_CAL_COMPONENT_ALARM_TRIGGER_NONE:
+               case E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
+                       break;
+
+               case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START:
+               case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END:
+                       offset = icaldurationtype_as_int (trigger.u.rel_duration);
+                       break;
+
+               default:
+                       break;
+               }
+
+               today = time (NULL);
+               event_relative = qa->orig_trigger - offset;
+
+               #define CLAMP_TO_DAY(x) ((x) - ((x) % (60 * 60 * 24)))
+
+               event_relative = CLAMP_TO_DAY (event_relative);
+               orig_trigger_day = CLAMP_TO_DAY (qa->orig_trigger);
+               today = CLAMP_TO_DAY (today);
+
+               #undef CLAMP_TO_DAY
+
+               if (event_relative < today && orig_trigger_day < today) {
+                       debug (("Skipping past alarm on '%s' for event '%s'", e_ctime (&qa->orig_trigger),
+                               icalcomponent_get_summary (e_cal_component_get_icalcomponent (comp))));
+
+                       e_cal_component_alarm_free (alarm);
+                       return;
+               }
+       }
+
        e_cal_component_alarm_get_action (alarm, &action);
        e_cal_component_alarm_free (alarm);
 
diff --git a/src/calendar/alarm-notify/alarm.c b/src/calendar/alarm-notify/alarm.c
index a4cebf6..1cca963 100644
--- a/src/calendar/alarm-notify/alarm.c
+++ b/src/calendar/alarm-notify/alarm.c
@@ -150,7 +150,7 @@ setup_timeout (void)
 
        /* Add the time out */
        debug (
-               ("Setting timeout for %d.%2d (from now) %" G_GINT64_FORMAT "%" G_GINT64_FORMAT,
+               ("Setting timeout for %d.%2d (from now) %" G_GINT64_FORMAT " %" G_GINT64_FORMAT,
                diff / 60, diff % 60, (gint64) ar->trigger, (gint64) now));
        debug ((" %s", ctime (&ar->trigger)));
        debug ((" %s", ctime (&now)));