[Xfce4-commits] <orage:master> 4.7.5.1: fixed error in counting start date of completed TODO

Juha Kautto noreply at xfce.org
Fri Dec 11 13:40:01 CET 2009


Updating branch refs/heads/master
         to 1774149c6d87d0b08738b8db76b666e1f177b8c3 (commit)
       from cb970bcdd6282bb4d7f16e8cdbb86263ef30ff96 (commit)

commit 1774149c6d87d0b08738b8db76b666e1f177b8c3
Author: Juha Kautto <juha at xfce.org>
Date:   Fri Dec 11 14:35:38 2009 +0200

    4.7.5.1: fixed error in counting start date of completed TODO
    
    Some TODOs did not take into account completed days even if they were
    defined to be based on completed date. This only happened when using
    archiving with repeating TODOs.

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

diff --git a/configure.in.in b/configure.in.in
index c4e69b2..43f0b84 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.5.0-git])
+m4_define([orage_version], [4.7.5.1-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 fc14e24..666e6bf 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -154,6 +154,7 @@ static struct icaltimetype ical_get_current_local_time()
 
     return(ctime);
 }
+
 static xfical_timezone_array get_ical_timezones()
 {
 #undef P_N
@@ -3035,8 +3036,9 @@ static xfical_appt *xfical_appt_get_next_on_day_internal(char *a_day
         c = icalcompiter_deref(&ci);
         per = ic_get_period(c, TRUE);
         if (type == XFICAL_TYPE_TODO) {
+            set_todo_times(c, &per); /* may change per.stime to be per.ctime */
             if (icaltime_is_null_time(per.ctime)
-            || local_compare(per.ctime, per.stime) <= 0)
+            || local_compare(per.ctime, per.stime) < 0)
             /* VTODO is never completed  */
             /* or it has completed before start, so
              * this one is not done and needs to be counted 
@@ -3056,7 +3058,6 @@ static xfical_appt *xfical_appt_get_next_on_day_internal(char *a_day
                 , ICAL_RRULE_PROPERTY)) != 0) { /* check recurring */
             nsdate = icaltime_null_time();
             rrule = icalproperty_get_rrule(p);
-            set_todo_times(c, &per); /* may change per.stime to be per.ctime */
             ri = icalrecur_iterator_new(rrule, per.stime);
             for (nsdate = icalrecur_iterator_next(ri),
                     nedate = icaltime_add(nsdate, per.duration);



More information about the Xfce4-commits mailing list