Store the initial view request and use that to decide whether to show

startup wizard or not. Show only for mail and not calendar.

1 files changed, 5 insertions, 0 deletions

diff --git a/shell/main.c b/shell/main.c
index 5a9855b402..e327065f43 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -576,6 +576,11 @@ main (gint argc, gchar **argv)
 		e_plugin_load_plugins ();
 	}
 
+	if (requested_view)
+		e_shell_set_startup_view(shell, requested_view);
+	else if (express_mode)
+		e_shell_set_startup_view(shell, "mail");
+
 	/* Attempt migration -after- loading all modules and plugins,
 	 * as both shell backends and certain plugins hook into this. */
 	e_shell_migrate_attempt (shell);