aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-startup-wizard.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 0b7e748184..72552e5af1 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2001-08-20 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-startup-wizard.c (finish_func): Don't free the returned
+ displayname.
+
+2001-08-20 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-view.c (pop_up_folder_bar): Make sure we display a pin
when we are popped up.
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 18b7b59287..3ea14180ab 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -301,12 +301,10 @@ finish_func (GnomeDruidPage *page,
CORBA_exception_init (&ev);
e_timezone_dialog_get_timezone (E_TIMEZONE_DIALOG (data->timezone_page->etd), &displayname);
- if (displayname == NULL) {
+ if (displayname == NULL)
tz = g_strdup ("");
- } else {
+ else
tz = g_strdup (displayname);
- g_free (displayname);
- }
bonobo_config_set_string (data->db, "/Calendar/Display/Timezone", tz, &ev);
g_free (tz);