diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 25e998633b..d29cbfe6b4 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2000-09-28 Ettore Perazzoli <ettore@helixcode.com> + + * e-shell-view.c: New constant `DEFAULT_URI'. + (e_shell_view_load_settings): If the `DisplayedURI' from + `gnome_config' cannot be displayed, display the `DEFAULT_URI'. + 2000-09-26 Ettore Perazzoli <ettore@helixcode.com> * e-shortcuts.c (e_shortcuts_get_group_title): Cast the data diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index b1444cd6ac..200b5dc99a 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -116,6 +116,8 @@ static guint signals[LAST_SIGNAL] = { 0 }; #define DEFAULT_WIDTH 705 #define DEFAULT_HEIGHT 550 +#define DEFAULT_URI "evolution:/local/Inbox" + /* Utility functions. */ @@ -1213,8 +1215,7 @@ e_shell_view_display_uri (EShellView *shell_view, if (uri == NULL) { gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0); - gtk_notebook_prepend_page (GTK_NOTEBOOK (priv->notebook), - create_label_for_empty_page (), NULL); + gtk_notebook_prepend_page (GTK_NOTEBOOK (priv->notebook), create_label_for_empty_page (), NULL); set_current_notebook_page (shell_view, 0); @@ -1239,9 +1240,8 @@ e_shell_view_display_uri (EShellView *shell_view, show_existing_view (shell_view, uri, control); } else if (! create_new_view_for_uri (shell_view, uri)) { priv->delayed_selection = g_strdup (uri); - gtk_signal_connect_after (GTK_OBJECT (e_shell_get_storage_set(priv->shell)), "new_folder", + gtk_signal_connect_after (GTK_OBJECT (e_shell_get_storage_set (priv->shell)), "new_folder", GTK_SIGNAL_FUNC (new_folder_cb), shell_view); - retval = FALSE; goto end; } @@ -1474,7 +1474,8 @@ e_shell_view_load_settings (EShellView *shell_view, e_paned_set_position (E_PANED (priv->view_hpaned), val); stringval = gnome_config_get_string ("DisplayedURI"); - e_shell_view_display_uri (shell_view, stringval); + if (! e_shell_view_display_uri (shell_view, stringval)) + e_shell_view_display_uri (shell_view, DEFAULT_URI); g_free (stringval); gnome_config_pop_prefix (); |