Updating branch refs/heads/master
to 7f13695786a709edf12596721668a86be130cd34 (commit)
from 5c50355dd9862699ce139be88c9795b7b1639255 (commit)
commit 7f13695786a709edf12596721668a86be130cd34
Author: Juha Kautto <j...@xfce.org>
Date: Wed Dec 15 01:42:35 2010 +0200
4.7.6.7 Fixed Bug 6643 "Note" section displays the description for the alarm
Orage does not use alarm description anymore. Orage will overwrite that.
It might be a good idea to alarm descriptions sometime, but now it works
as planned.
Also added reminder date to reminder test function.
README | 3 +++
configure.in.in | 2 +-
src/appointment.c | 7 +++++++
src/ical-code.c | 5 +++++
4 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/README b/README
index 34338c4..9d59d33 100644
--- a/README
+++ b/README
@@ -6,6 +6,9 @@ that you can manually add row:
[PARAMETERS]
as first line to the parameter file (~/.config/orage/oragerc).
+Note that Orage Xfce panel plugin changed name in 4.7, so you need to remove
+it and add it back to use the new features.
+
Note that there is no conversion routine to migrate your old data into
the new version (from 4.4 to 4.6 for example) so after each major version
you need to manually add appointments.
diff --git a/configure.in.in b/configure.in.in
index 8ea5428..36274e3 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.7.6.6-git])
+m4_define([orage_version], [4.7.6.7-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 5b17d42..58f3348 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -2459,6 +2459,7 @@ static void on_test_button_clicked_cb(GtkButton *button
appt_win *apptw = (appt_win *)user_data;
xfical_appt *appt = (xfical_appt *)apptw->xf_appt;
alarm_struct cur_alarm;
+ gchar *tmp1, *tmp2;
fill_appt_from_apptw(appt, apptw);
@@ -2468,6 +2469,11 @@ static void on_test_button_clicked_cb(GtkButton *button
cur_alarm.uid = g_strdup(appt->uid);
else
cur_alarm.uid = NULL;
+ tmp1 = g_strdup(orage_icaltime_to_i18_time(appt->starttime));
+ tmp2 = g_strdup(orage_icaltime_to_i18_time(appt->endtime));
+ cur_alarm.action_time = g_strconcat(tmp1, " - ", tmp2, NULL);
+ g_free(tmp1);
+ g_free(tmp2);
cur_alarm.title = g_strdup(appt->title);
cur_alarm.description = g_strdup(appt->note);
cur_alarm.persistent = appt->alarm_persistent;
@@ -2489,6 +2495,7 @@ static void on_test_button_clicked_cb(GtkButton *button
cur_alarm.cmd = NULL;
create_reminders(&cur_alarm);
g_free(cur_alarm.uid);
+ g_free(cur_alarm.action_time);
g_free(cur_alarm.title);
g_free(cur_alarm.description);
g_free(cur_alarm.sound);
diff --git a/src/ical-code.c b/src/ical-code.c
index e59e394..2e38c8e 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -929,6 +929,7 @@ static void appt_add_alarm_internal_display(xfical_appt
*appt
#endif
icalcomponent_add_property(ialarm
, icalproperty_new_action(ICAL_ACTION_DISPLAY));
+ /* FIXME: add real alarm description and use the below as default only */
if ORAGE_STR_EXISTS(appt->note)
icalcomponent_add_property(ialarm
, icalproperty_new_description(appt->note));
@@ -1673,9 +1674,12 @@ static void get_alarm_data(icalcomponent *ca,
xfical_appt *appt)
act = icalproperty_get_action(p);
if (act == ICAL_ACTION_DISPLAY) {
get_alarm_data_x(ca, appt);
+ /* fixing bug 6643 by commenting next 3 lines */
+ /* FIXME properly by adding real alarm description
p = icalcomponent_get_first_property(ca, ICAL_DESCRIPTION_PROPERTY);
if (p)
appt->note = (char *)icalproperty_get_description(p);
+ */
/* default display alarm is orage if none is set */
if (!appt->display_alarm_orage && !appt->display_alarm_notify)
appt->display_alarm_orage = TRUE;
@@ -2766,6 +2770,7 @@ static void process_alarm_data(icalcomponent *ca,
alarm_struct *new_alarm)
new_alarm->display_orage = appt->display_alarm_orage;
new_alarm->display_notify = appt->display_alarm_notify;
new_alarm->notify_timeout = appt->display_notify_timeout;
+ /* FIXME: use real alarm data */
if (ORAGE_STR_EXISTS(appt->note))
new_alarm->description = orage_process_text_commands(appt->note);
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
