diff options
| author | Michael Zucci <zucchi@src.gnome.org> | 2004-09-20 13:59:55 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-09-20 13:59:55 +0800 |
| commit | ef6a3af717132e0750f226fa8a0ee0f3c98e19f0 (patch) | |
| tree | f4ed25f7a247a8ccb855a8d940777e7a3d21a3e3 /shell | |
| parent | 96111b1f1487ca3fe454b340a73ba927cc6bfb83 (diff) | |
| download | gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.tar.gz gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.tar.zst gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.zip | |
Merged notzed-eplugin-2-branch to head.
svn path=/trunk/; revision=27300
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 4 | ||||
| -rw-r--r-- | shell/e-shell.c | 2 |
2 files changed, 6 insertions, 0 deletions
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 <NotZed@Ximian.com> + + * e-shell.c (e_shell_construct): disable the startup wizard. + 2004-06-24 Not Zed <NotZed@Ximian.com> ** 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; |