From 012f7f454a31d5430eae0d4372b49f537ec65beb Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Tue, 4 Sep 2001 21:20:57 +0000 Subject: Shut down other components correctly when cancelling the first time startup dialog svn path=/trunk/; revision=12600 --- shell/ChangeLog | 5 +++++ shell/e-shell.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 2dc8756ec0..5a35a8243f 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2001-09-04 Iain Holmes + + * e-shell.c (e_shell_construct): Make the other components shut down + correctly when the first time dialog is cancelled. + 2001-09-04 Ettore Perazzoli * e-storage-set-view.c (tree_drag_motion): Remove debugging diff --git a/shell/e-shell.c b/shell/e-shell.c index 64f6364a08..23cd4bc7e6 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -969,7 +969,9 @@ e_shell_construct (EShell *shell, } if (e_shell_startup_wizard_create () == FALSE) { - /* FIXME: Need to kill all components somehow */ + e_shell_unregister_all (shell); + bonobo_object_unref (BONOBO_OBJECT (shell)); + exit (0); } shortcut_path = g_concat_dir_and_file (local_directory, "shortcuts.xml"); -- cgit