[Xfce4-commits] <orage:master> 4.7.6.8: enhancement 6834 Alarms defined to be run less than 2 minutes don't work

[Juha Kautto]

Updating branch refs/heads/master
         to 1603a8f63cf564f16ba221cee10a62c5435164c8 (commit)
       from 7f13695786a709edf12596721668a86be130cd34 (commit)

commit 1603a8f63cf564f16ba221cee10a62c5435164c8
Author: Juha Kautto <juha at xfce.org>
Date:   Wed Dec 15 23:44:28 2010 +0200

    4.7.6.8: enhancement 6834 Alarms defined to be run less than 2 minutes don't work
    
    Now it is possible to create alarm which raises exactly at the event time.
    Orage no longer checks that time is zero, but instead that some action
    is defined.

 configure.in.in |    2 +-
 src/ical-code.c |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 36274e3..226a8c5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.7.6.7-git])
+m4_define([orage_version], [4.7.6.8-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/ical-code.c b/src/ical-code.c
index 2e38c8e..de24a2c 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -1105,9 +1105,8 @@ static void appt_add_alarm_internal(xfical_appt *appt, icalcomponent *ievent)
 #ifdef ORAGE_DEBUG
     orage_message(-200, P_N);
 #endif
-    if (appt->alarmtime == 0) { /* no alarm */
-        return;
-    }
+    /* these lines may not be needed if there are no alarms defined, but
+       they are fast so it does not make sense to test */
     duration = appt->alarmtime;
     trg.time = icaltime_null_time();
     if (appt->alarm_before)