[evolution-exchange] Bug #604255 - e-calendar-factory crashed on start up
- From: Milan Crha <mcrha src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-exchange] Bug #604255 - e-calendar-factory crashed on start up
- Date: Thu, 10 Dec 2009 15:53:28 +0000 (UTC)
commit ed5a1bfc7bcd808dcdb42c4d061defd8c3649c54
Author: Milan Crha <mcrha redhat com>
Date: Thu Dec 10 16:52:32 2009 +0100
Bug #604255 - e-calendar-factory crashed on start up
Regression after fix for bug #602945.
calendar/e-cal-backend-exchange.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index 57b8cc5..f86783a 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -2154,8 +2154,14 @@ e_cal_backend_exchange_lookup_timezone (const gchar *tzid,
gconstpointer custom,
GError **error)
{
- return internal_get_timezone (E_CAL_BACKEND ((ECalBackendExchange *)custom),
- tzid);
+ icaltimezone *zone = internal_get_timezone (E_CAL_BACKEND ((ECalBackendExchange *)custom), tzid);
+
+ /* The UTC timezone is a fallback, which is not supposed
+ to be returned in call of e_cal_check_timezones, thus skip it */
+ if (zone && zone == icaltimezone_get_utc_timezone ())
+ zone = NULL;
+
+ return zone;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]