Updating branch refs/heads/master
to 61d2303af18d0866e73902c67b033c865055fce9 (commit)
from 8e6277b5d2730fa9723e7252d001360092b23ff9 (commit)
commit 61d2303af18d0866e73902c67b033c865055fce9
Author: Juha Kautto <[email protected]>
Date: Mon May 3 16:25:25 2010 +0300
4.7.5.23 Fixed appointment repeat window to show complexity correctly
Appointment reoccurrency tab showed several appointments to be advanced
complexity even though they were normal. The repeat option was erroneously
considered to make the appointment complex.
configure.in.in | 2 +-
src/appointment.c | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 067cd2a..0f7980b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <[email protected]>
dnl
dnl Version information
-m4_define([orage_version], [4.7.5.22-git])
+m4_define([orage_version], [4.7.5.23-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/appointment.c b/src/appointment.c
index eb09665..34e7c1c 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -2218,10 +2218,9 @@ static void fill_appt_window_recurrence(appt_win *apptw,
xfical_appt *appt)
GTK_SPIN_BUTTON(apptw->Recur_int_spin)
, (gdouble)appt->interval);
- if (appt->interval > 1
- || !appt->recur_byday[0] || !appt->recur_byday[1] || !appt->recur_byday[2]
- || !appt->recur_byday[3] || !appt->recur_byday[4] || !appt->recur_byday[5]
- || !appt->recur_byday[6]) {
+ if (!appt->recur_byday[0] || !appt->recur_byday[1] ||
!appt->recur_byday[2]
+ || !appt->recur_byday[3] || !appt->recur_byday[4] ||
!appt->recur_byday[5]
+ || !appt->recur_byday[6]) {
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(apptw->Recur_feature_advanced_rb), TRUE);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
