aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am1
-rw-r--r--shell/e-shell-startup-wizard.c8
2 files changed, 7 insertions, 2 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index be6a3bea8a..c406707087 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = glade importer
INCLUDES = -O \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/libical/src/libical \
-I$(top_srcdir) \
$(BONOBO_GNOME_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index a65aa1799f..33e3297bd6 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -336,6 +336,7 @@ finish_func (GnomeDruidPage *page,
{
CORBA_Environment ev;
char *displayname, *tz;
+ icaltimezone *zone;
/* Notify mailer */
CORBA_exception_init (&ev);
@@ -346,10 +347,13 @@ finish_func (GnomeDruidPage *page,
CORBA_exception_init (&ev);
e_timezone_dialog_get_timezone (E_TIMEZONE_DIALOG (data->timezone_page->etd), &displayname);
- if (displayname == NULL)
+ /* We know it is a builtin timezone, as that is all the user can change
+ it to. */
+ zone = e_timezone_dialog_get_builtin_timezone (displayname);
+ if (zone == NULL)
tz = g_strdup ("UTC");
else
- tz = g_strdup (displayname);
+ tz = g_strdup (icaltimezone_get_location (zone));
bonobo_config_set_string (data->db, "/Calendar/Display/Timezone", tz, &ev);
g_free (tz);