Accidentally merged the configdb branch into master. Reverting.

[citadel.git] / citadel / ical_dezonify.c

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 34c0e4bff64e77c381d6a9f3e44c300af1fb3cab..41c67a7e7556261649db1aac46e37e2b7f7e6d6e 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -2,16 +2,6 @@
  * Function to go through an ical component set and convert all non-UTC
  * date/time properties to UTC.  It also strips out any VTIMEZONE
  * subcomponents afterwards, because they're irrelevant.
- *
- * Copyright (c) 1987-2015 by the citadel.org team
- *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 
@@ -44,7 +34,8 @@
 icaltimezone *get_default_icaltimezone(void) {
 
         icaltimezone *zone = NULL;
-       char *default_zone_name = CtdlGetConfigStr("c_default_cal_zone");
+       char *default_zone_name = config.c_default_cal_zone;
+       //char *default_zone_name = "America/New_York";
 
         if (!zone) {
                 zone = icaltimezone_get_builtin_timezone(default_zone_name);