aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--my-evolution/ChangeLog4
-rw-r--r--my-evolution/e-summary.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 014c9d4fe0..980ae96245 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-13 Damon Chaplin <damon@ximian.com>
+
+ * e-summary.c (e_summary_init): make the timezone default to UTC.
+
2001-11-08 Ettore Perazzoli <ettore@ximian.com>
* e-summary-preferences.c: Removed `morons.org'.
diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c
index 51b6c41b48..a74efaa1ca 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.c
@@ -520,7 +520,12 @@ e_summary_init (ESummary *summary)
return;
}
- summary->timezone = bonobo_config_get_string (db, "/Calendar/Display/Timezone", NULL);
+ summary->timezone = bonobo_config_get_string_with_default (db,
+ "/Calendar/Display/Timezone", "UTC", NULL);
+ if (!summary->timezone || !summary->timezone[0]) {
+ g_free (summary->timezone);
+ summary->timezone = g_strdup ("UTC");
+ }
summary->tz = icaltimezone_get_builtin_timezone (summary->timezone);
bonobo_object_release_unref (db, NULL);