From 4187293731274274e4283d9039f6e30c95578118 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 Aug 2008 16:18:42 +0000 Subject: Merge revisions 35993:36015 from trunk. Adapt recent "crash recovery" changes to new architecture. svn path=/branches/kill-bonobo/; revision=36018 --- shell/e-shell.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'shell/e-shell.c') diff --git a/shell/e-shell.c b/shell/e-shell.c index f617fe27ad..1d2d68b57e 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -104,8 +104,13 @@ EShellWindow * e_shell_create_window (void) { GtkWidget *shell_window; + gboolean safe_mode; - shell_window = e_shell_window_new (); + /* Put the first window into safe mode if we detect the previous + * session did not shut down cleanly, perhaps due to a crash. */ + safe_mode = (active_windows == NULL) && e_file_lock_exists (); + + shell_window = e_shell_window_new (safe_mode); active_windows = g_list_prepend (active_windows, shell_window); -- cgit v1.2.3