aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell-view.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 9950766fc5..31cfcf1607 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-30 Iain Holmes <iain@ximian.com>
+
+ * e-shell-view.c (e_shell_view_load_settings): If the display uri is
+ NULL, set the view to the default.
+
2001-10-30 Ettore Perazzoli <ettore@ximian.com>
* evolution-shell-component.c (owner_ping_callback): Duplicate the
@@ -20,7 +25,7 @@
"removed_folder" signal with gtk_signal_connect_while_alive() so
we don't crash if the view gets destroyed. Fixes #13285.
-2001-10-30 <NotZed@Ximian.com>
+2001-10-29 Ettore Perazzoli <ettore@ximian.com>
* e-shell-startup-wizard.c (next_func): If we're not at the end of
the druid list, tell the druid we're going to change the page.
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index fc090204e0..cd9355b90e 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -2464,8 +2464,12 @@ e_shell_view_load_settings (EShellView *shell_view,
key = g_strconcat (prefix, "DisplayedURI", NULL);
stringval = bonobo_config_get_string (db, key, NULL);
- if (! e_shell_view_display_uri (shell_view, stringval))
+ if (stringval) {
+ if (! e_shell_view_display_uri (shell_view, stringval))
+ e_shell_view_display_uri (shell_view, E_SHELL_VIEW_DEFAULT_URI);
+ } else
e_shell_view_display_uri (shell_view, E_SHELL_VIEW_DEFAULT_URI);
+
g_free (stringval);
g_free (key);