From 152c6a69b1c2454bc0920092e42005e168e01743 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Wed, 24 Jan 2001 18:55:10 +0000 Subject: (Fix #1252: Need a File->Close way to close a view) 2001-01-24 Jason Leach (Fix #1252: Need a File->Close way to close a view) * evolution.xml: new File->Close menu item and associated command. 2001-01-24 Jason Leach (Fix #1252: Need a File->Close way to close a view) * e-shell-view-menu.c (command_close): New function, destroys the current view. * e-shell.c (view_destroy_cb): Make sure shell settings get saved when the last view is destroyed. svn path=/trunk/; revision=7787 --- shell/e-shell.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'shell/e-shell.c') diff --git a/shell/e-shell.c b/shell/e-shell.c index fec2a2febd..8cecea7d4f 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -525,12 +525,21 @@ view_destroy_cb (GtkObject *object, gpointer data) { EShell *shell; + int nviews; g_assert (E_IS_SHELL_VIEW (object)); shell = E_SHELL (data); - shell->priv->views = g_list_remove ( - shell->priv->views, object); + + nviews = g_list_length (shell->priv->views); + + /* If this is our last view, save settings now because in the + callback for no_views_left shell->priv->views will be NULL + and settings won't be saved because of that */ + if (nviews - 1 == 0) + e_shell_save_settings (shell); + + shell->priv->views = g_list_remove (shell->priv->views, object); if (shell->priv->views == NULL) { /* FIXME: This looks like a Bonobo bug to me. */ -- cgit v1.2.3