diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 10 | ||||
| -rw-r--r-- | shell/main.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index ade04fca4e..ff947e9229 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2008-12-28 Matthew Barnes <mbarnes@redhat.com> + + ** Related to bug #562155 + + * main.c (idle_cb): + Only call e_shell_set_crash_recovery() if the EShell Bonobo object + was constructed successfully, otherwise it will be NULL. This fixes + a warning shown in the terminal output of bug #562155, but the bug + is not reproducible so it's not clear whether this fixes the bug. + 2008-12-14 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #564416 diff --git a/shell/main.c b/shell/main.c index 3e1176e92a..1638de0788 100644 --- a/shell/main.c +++ b/shell/main.c @@ -335,10 +335,10 @@ idle_cb (gchar **uris) startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE; shell = e_shell_new (startup_line_mode, &result); - e_shell_set_crash_recovery (shell, e_file_lock_exists ()); switch (result) { case E_SHELL_CONSTRUCT_RESULT_OK: + e_shell_set_crash_recovery (shell, e_file_lock_exists ()); g_signal_connect (shell, "no_windows_left", G_CALLBACK (no_windows_left_cb), NULL); g_object_weak_ref (G_OBJECT (shell), shell_weak_notify, NULL); corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell)); |