Merge branch 'express2'

3 files changed, 30 insertions, 5 deletions

diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index fa917e7e79..6cc2e80d4d 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -46,6 +46,7 @@
 #include "mail/em-config.h"
 #include <mail/em-junk.h>
 #include <gconf/gconf-client.h>
+#include "shell/e-shell.h"
 
 #ifndef BOGOFILTER_BINARY
 #define BOGOFILTER_BINARY "/usr/bin/bogofilter"
@@ -383,6 +384,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data)
 GtkWidget *
 org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
 {
+	EShell *shell;
 	GtkWidget *check;
 	guint n_rows;
 
@@ -398,7 +400,13 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac
 	gtk_table_attach (
 		GTK_TABLE (data->parent), check,
 		0, 1, n_rows, n_rows+1, 0, 0, 0, 0);
-	gtk_widget_show (check);
-	return (GtkWidget *)check;
+
+	shell = e_shell_get_default ();
+	if (e_shell_get_express_mode (shell))
+		gtk_widget_hide (check);
+	else
+		gtk_widget_show (check);
+
+	return check;
 }
 
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index f52cd8c4ae..537831a07e 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -41,6 +41,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "mail/em-config.h"
+#include "shell/e-shell.h"
 
 #include <gconf/gconf-client.h>
 
@@ -920,6 +921,7 @@ use_remote_tests_cb (GtkWidget *widget, gpointer data)
 GtkWidget *
 org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
 {
+	EShell *shell;
 	GtkWidget *check, *vbox, *label;
 	gchar *text = g_strdup_printf ("    <small>%s</small>", _("This will make SpamAssassin more reliable, but slower"));
 	guint n_rows;
@@ -942,7 +944,13 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact
 	gtk_table_attach (
 		GTK_TABLE (data->parent), vbox,
 		0, 1, n_rows, n_rows+1, 0, 0, 0, 0);
-	gtk_widget_show_all (vbox);
-	return (GtkWidget *)vbox;
+
+	shell = e_shell_get_default ();
+	if (e_shell_get_express_mode (shell))
+		gtk_widget_hide (vbox);
+	else
+		gtk_widget_show_all (vbox);
+
+	return vbox;
 }
 
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);