aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorDamon Chaplin <damon@ximian.com>2001-10-03 12:34:53 +0800
committerDamon Chaplin <damon@src.gnome.org>2001-10-03 12:34:53 +0800
commit7e35463832751ecfa20a10949eac4188a8c00125 (patch)
treef32e979ea8b50a7f5c29e90473c06369f15c5e01 /calendar/gui
parent83529b8532f36c48724626e63009683266a42a3b (diff)
downloadgsoc2013-evolution-7e35463832751ecfa20a10949eac4188a8c00125.tar
gsoc2013-evolution-7e35463832751ecfa20a10949eac4188a8c00125.tar.gz
gsoc2013-evolution-7e35463832751ecfa20a10949eac4188a8c00125.tar.bz2
gsoc2013-evolution-7e35463832751ecfa20a10949eac4188a8c00125.tar.lz
gsoc2013-evolution-7e35463832751ecfa20a10949eac4188a8c00125.tar.xz
gsoc2013-evolution-7e35463832751ecfa20a10949eac4188a8c00125.tar.zst
gsoc2013-evolution-7e35463832751ecfa20a10949eac4188a8c00125.zip
save the EXDATE as a DATE-TIME value, since we know the exact time. Fixes
2001-10-03 Damon Chaplin <damon@ximian.com> * gui/comp-util.c (cal_comp_util_add_exdate): save the EXDATE as a DATE-TIME value, since we know the exact time. Fixes bug #11278. (Before we were setting is_date, but icaltime_from_timet_with_zone() didn't convert it properly. We need to figure out how to handle DATEs when using time_t's.) * gui/dialogs/recurrence-page.c (get_exception_string): use e_time_format_date_and_time() so we show the time as well, if the exception is a DATE-TIME value. * cal-util/timeutil.c: removed time_add_month(), time_year_begin(), time_month_begin() & time_week_begin() - old pre-timezone functions which we no longer use. * cal-util/cal-recur.c (cal_recur_from_icalproperty): set ir.until.is_date to FALSE before converting to a time_t. Hopefully fixes bug #5034. svn path=/trunk/; revision=13366
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/comp-util.c2
-rw-r--r--calendar/gui/dialogs/recurrence-page.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index f0376e2a99..995e69a270 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -49,7 +49,7 @@ cal_comp_util_add_exdate (CalComponent *comp, time_t t, icaltimezone *zone)
cdt = g_new (CalComponentDateTime, 1);
cdt->value = g_new (struct icaltimetype, 1);
- *cdt->value = icaltime_from_timet_with_zone (t, TRUE, zone);
+ *cdt->value = icaltime_from_timet_with_zone (t, FALSE, zone);
cdt->tzid = g_strdup (icaltimezone_get_tzid (zone));
list = g_slist_append (list, cdt);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 10946805ed..ddd37fa3b2 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -419,7 +419,8 @@ get_exception_string (CalComponentDateTime *dt)
dt->value->month - 1,
dt->value->year);
- strftime (buf, sizeof (buf), _("%a %b %d %Y"), &tmp_tm);
+ e_time_format_date_and_time (&tmp_tm, calendar_config_get_24_hour_format(), FALSE, FALSE, buf, sizeof (buf));
+
return buf;
}