aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog4
-rw-r--r--shell/e-shell.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 1268414dfb..dd13623e88 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-04 JP Rosevear <jpr@ximian.com>
+
+ * e-shell.c (e_shell_quit): make this C89 compliant
+
2004-02-04 Not Zed <NotZed@Ximian.com>
** See bug #53683.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 172939c387..18909bd0ff 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1122,9 +1122,6 @@ es_run_quit(EShell *shell)
gboolean
e_shell_quit(EShell *shell)
{
- if (shell->priv->preparing_to_quit)
- return FALSE;
-
EShellPrivate *priv;
GSList *component_infos;
GSList *sp;
@@ -1134,6 +1131,9 @@ e_shell_quit(EShell *shell)
priv = shell->priv;
+ if (priv->preparing_to_quit)
+ return FALSE;
+
component_infos = e_component_registry_peek_list (priv->component_registry);
can_quit = TRUE;
for (sp = component_infos; sp != NULL; sp = sp->next) {