From f7e298665b02f72890c6681e6d21ef5601beccbb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 15 Feb 2009 03:27:31 +0000 Subject: Merge revisions 37200:3266 from trunk. svn path=/branches/kill-bonobo/; revision=37270 --- calendar/gui/calendar-config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'calendar/gui/calendar-config.c') diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index b5928b6523..2459885b8d 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -244,7 +244,8 @@ calendar_config_get_icaltimezone (void) icalproperty *tz_prop, *offset_to; icaltimezone *st_zone = NULL; int offset; - char *n_tzid, *tzid; + const char *tzid; + char *n_tzid; tzid = icaltimezone_get_tzid (zone); n_tzid = g_strconcat (tzid, "-(Standard)", NULL); @@ -296,7 +297,7 @@ calendar_config_get_icaltimezone (void) /* Sets the timezone. If set to NULL it defaults to UTC. FIXME: Should check it is being set to a valid timezone. */ void -calendar_config_set_timezone (gchar *timezone) +calendar_config_set_timezone (const gchar *timezone) { calendar_config_init (); -- cgit v1.2.3