aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/startup-wizard
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/startup-wizard')
-rw-r--r--plugins/startup-wizard/startup-wizard.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index e232df4dea..904e630487 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -67,12 +67,21 @@ startup_wizard_close (void) {
void
startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target)
{
+ EShell *shell;
GtkWidget *start_page;
GtkLabel *start_page_label;
GConfClient *client;
GSList *accounts;
EConfig *config;
EMAccountEditor *emae;
+ const gchar *req_view;
+
+ shell = e_shell_get_default ();
+ req_view = e_shell_get_startup_view (shell);
+
+ if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode (shell)) {
+ return;
+ }
client = gconf_client_get_default ();
accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL);
@@ -85,7 +94,7 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target)
return;
}
- if (e_shell_get_express_mode (e_shell_get_default ())) {
+ if (e_shell_get_express_mode (shell)) {
start_page = (GtkWidget *)mail_capplet_shell_new (0, TRUE, TRUE);
gtk_widget_show (start_page);