From ef6a3af717132e0750f226fa8a0ee0f3c98e19f0 Mon Sep 17 00:00:00 2001 From: Michael Zucci Date: Mon, 20 Sep 2004 05:59:55 +0000 Subject: Merged notzed-eplugin-2-branch to head. svn path=/trunk/; revision=27300 --- shell/ChangeLog | 4 ++++ shell/e-shell.c | 2 ++ 2 files changed, 6 insertions(+) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 35d157ff3c..c04f5d0863 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -94,6 +94,10 @@ * e-shell-errors.xml.h: Add this back to CVS for translators * .cvsignore: Don't ignore e-shell-errors.xml.h +2004-09-07 Not Zed + + * e-shell.c (e_shell_construct): disable the startup wizard. + 2004-06-24 Not Zed ** See bug #57367. diff --git a/shell/e-shell.c b/shell/e-shell.c index 0e43ee3fd7..07c7dd9df5 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -643,10 +643,12 @@ e_shell_construct (EShell *shell, e_shell_attempt_upgrade(shell); +#if 0 if (e_shell_startup_wizard_create () == FALSE) { bonobo_object_unref (BONOBO_OBJECT (shell)); exit (0); } +#endif priv->is_initialized = TRUE; -- cgit v1.2.3