Merge from master

1 files changed, 17 insertions, 11 deletions

diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index aa8755973a..4f30a4e4f3 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -37,8 +37,6 @@ static GConfClient *conf_client = NULL;
 static GSetting *calendar_settings = NULL;
 static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL;
 
-
-
 /* Copied from ../calendar-config.c; returns whether the locale has 'am' and
  * 'pm' strings defined.
  */
@@ -261,16 +259,25 @@ config_data_set_last_notification_time (ECalClient *cal,
 	if (cal) {
 		ESource *source = e_client_get_source (E_CLIENT (cal));
 		if (source) {
-			GTimeVal tmval = {0};
-			gchar *as_text;
+			const gchar *prop_str;
+			GTimeVal curr_tv = {0};
+
+			prop_str = e_source_get_property (source, "last-notified");
+			if (!prop_str || !g_time_val_from_iso8601 (prop_str, &curr_tv))
+				curr_tv.tv_sec = 0;
 
-			tmval.tv_sec = (glong) t;
-			as_text = g_time_val_to_iso8601 (&tmval);
+			if (t > (time_t) curr_tv.tv_sec || (time_t) curr_tv.tv_sec > now) {
+				GTimeVal tmval = {0};
+				gchar *as_text;
 
-			if (as_text) {
-				e_source_set_property (source, "last-notified", as_text);
-				g_free (as_text);
-				return;
+				tmval.tv_sec = (glong) t;
+				as_text = g_time_val_to_iso8601 (&tmval);
+
+				if (as_text) {
+					e_source_set_property (source, "last-notified", as_text);
+					g_free (as_text);
+					/* pass through, thus the global last notification time is also changed */
+				}
 			}
 		}
 	}
@@ -317,7 +324,6 @@ config_data_get_last_notification_time (ECalClient *cal)
 
 	value = g_settings_get_int (calendar_settings, "last-notification-time");
 	now = time (NULL);
-
 	if (val > now)
 		val = now;