Updating branch refs/heads/master
to 63f351bc49a58dd3c18aa1399279a3db9690b889 (commit)
from bf7da8662252521f2dcd60dc7d9baa615379917d (commit)
commit 63f351bc49a58dd3c18aa1399279a3db9690b889
Author: Juha <j...@xfce.org>
Date: Fri Feb 1 15:36:58 2013 +0200
4.9.0.0: Fixed Bug 9249 1 Flag show wrong for hourly recurrence
Added hourly recurrency to the flags and to the tooltip.
Also fixed alarm to correctly show if it is set and if it is persistent.
configure.in.in | 8 ++++----
src/event-list.c | 13 ++++++++-----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 7f8f730..5ea2e00 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,11 +9,11 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.8.4.0-git])
+m4_define([orage_version], [4.9.0.0-git])
-m4_define([gtk_minimum_version], [2.10.0])
-m4_define([xfce_minimum_version], [4.6.0])
-m4_define([dbus_minimum_version], [0.34])
+m4_define([gtk_minimum_version], [2.14.0])
+m4_define([xfce_minimum_version], [4.8.0])
+m4_define([dbus_minimum_version], [0.1])
m4_define([notify_minimum_version], [0.3.2])
m4_define([intltool_minimum_version], [0.31])
m4_define([libical_minimum_version], [0.43])
diff --git a/src/event-list.c b/src/event-list.c
index b63c66a..1969bd3 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -373,9 +373,10 @@ static void add_el_row(el_win *el, xfical_appt *appt, char
*par)
guint len = 50;
stime = format_time(el, appt, par);
- if (appt->alarmtime != 0)
- if (appt->sound != NULL)
- flags[0] = 'S';
+ if (appt->display_alarm_orage || appt->display_alarm_notify
+ || appt->sound_alarm || appt->procedure_alarm)
+ if (appt->alarm_persistent)
+ flags[0] = 'P';
else
flags[0] = 'A';
else
@@ -391,8 +392,10 @@ static void add_el_row(el_win *el, xfical_appt *appt, char
*par)
flags[1] = 'M';
else if (appt->freq == XFICAL_FREQ_YEARLY)
flags[1] = 'Y';
+ else if (appt->freq == XFICAL_FREQ_HOURLY)
+ flags[1] = 'H';
else
- flags[1] = 'n';
+ flags[1] = '?';
if (appt->availability != 0)
flags[2] = 'B';
@@ -1320,7 +1323,7 @@ static void build_event_list(el_win *el)
gtk_tree_view_append_column(GTK_TREE_VIEW(el->TreeView), col);
gtk_tree_view_column_set_visible(col, FALSE);
- gtk_tooltips_set_tip(el->Tooltips, el->TreeView, _("Double click line to
edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=visual Alarm
S=also Sound alarm\n\t 2. Recurrence: n=no recurrence\n\t\t D=Daily W=Weekly
M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in
file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event
T=Todo J=Journal"), NULL);
+ gtk_tooltips_set_tip(el->Tooltips, el->TreeView, _("Double click line to
edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set
P=Persistent alarm is set\n\t 2. Recurrence: n=no recurrence\n\t\t H=Hourly
D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located
in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event
T=Todo J=Journal"), NULL);
g_signal_connect(el->TreeView, "row-activated",
G_CALLBACK(editEvent), el);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
