aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-09-05 05:20:57 +0800
committerIain Holmes <iain@src.gnome.org>2001-09-05 05:20:57 +0800
commit012f7f454a31d5430eae0d4372b49f537ec65beb (patch)
tree8b6ab5893b2644f6f65c5851d9ea90998379aa23
parent099d43d698f0fcc54ac2028d2b47a580d612100c (diff)
downloadgsoc2013-evolution-012f7f454a31d5430eae0d4372b49f537ec65beb.tar
gsoc2013-evolution-012f7f454a31d5430eae0d4372b49f537ec65beb.tar.gz
gsoc2013-evolution-012f7f454a31d5430eae0d4372b49f537ec65beb.tar.bz2
gsoc2013-evolution-012f7f454a31d5430eae0d4372b49f537ec65beb.tar.lz
gsoc2013-evolution-012f7f454a31d5430eae0d4372b49f537ec65beb.tar.xz
gsoc2013-evolution-012f7f454a31d5430eae0d4372b49f537ec65beb.tar.zst
gsoc2013-evolution-012f7f454a31d5430eae0d4372b49f537ec65beb.zip
Shut down other components correctly when cancelling the first time startup dialog
svn path=/trunk/; revision=12600
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell.c4
2 files changed, 8 insertions, 1 deletions
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 <iain@ximian.com>
+
+ * 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 <ettore@ximian.com>
* 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");