diff options
| -rw-r--r-- | shell/ChangeLog | 8 | ||||
| -rw-r--r-- | shell/e-shell.c | 18 |
2 files changed, 17 insertions, 9 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 2c98894337..482f7e111f 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2001-12-14 Ettore Perazzoli <ettore@ximian.com> + + [Fix #17258, shell displays splash even if Evolution is already + running.] + + * e-shell.c (e_shell_construct): Display the splash screen only if + the registration succeeds. + 2001-12-12 Ettore Perazzoli <ettore@ximian.com> [Fix #14838, saving passwords doesn't work. It is actually a diff --git a/shell/e-shell.c b/shell/e-shell.c index 88a9f08a4f..abcd11819f 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -1106,15 +1106,6 @@ e_shell_construct (EShell *shell, CORBA_exception_free (&ev); - if (! show_splash) { - splash = NULL; - } else { - splash = e_splash_new (); - gtk_signal_connect (GTK_OBJECT (splash), "delete_event", - GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL); - gtk_widget_show (splash); - } - /* Now we can register into OAF. Notice that we shouldn't be registering into OAF until we are sure we can complete. */ @@ -1125,6 +1116,15 @@ e_shell_construct (EShell *shell, return E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER; } + if (! show_splash) { + splash = NULL; + } else { + splash = e_splash_new (); + gtk_signal_connect (GTK_OBJECT (splash), "delete_event", + GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL); + gtk_widget_show (splash); + } + while (gtk_events_pending ()) gtk_main_iteration (); |